summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1Ricardo Cerqueira2015-03-102-2/+2
|\ | | | | | | Android 5.1.0 release 1
| * am e2dd0564: (-s ours) am 01444335: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ | | | | | | | | | | | | * commit 'e2dd056481acd2ef399ffbb020ff2bc5c1e460eb': Import translations. DO NOT MERGE
| | * am 01444335: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ | |_|/ |/| | | | | | | | * commit '01444335f44050f00403989b6e218a4f143bfc88': Import translations. DO NOT MERGE
* | | Import translations. DO NOT MERGEstaging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Baligh Uddin2014-10-191-1/+1
| | | | | | | | | | | | | | | Change-Id: I94982e075696c3684fa2851b94658406a6731917 Auto-generated-cl: translation import
| * | am ea0cf796: am 952bdd2f: Update nav bar background colorMaurice Lam2014-09-241-2/+2
| |\| | | | | | | | | | | | | * commit 'ea0cf796b0d32e652300ff33056a4687ee0b846d': Update nav bar background color
| | * am 952bdd2f: Update nav bar background colorMaurice Lam2014-09-241-2/+2
| | |\ | |_|/ |/| | | | | | | | * commit '952bdd2ffc443b5d0b79486a51c10e9bc5365886': Update nav bar background color
* | | Update nav bar background colorMaurice Lam2014-09-241-2/+2
| | | | | | | | | | | | | | | Bug: 17607821 Change-Id: Iab397faa38793d933ef62bcfa21c5993d9b8c3b1
| * | am b59aff7a: (-s ours) am 5bf92ed7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\| | | | | | | | | | | | | * commit 'b59aff7af63f7928bc5a52108e2e84b4785299d3': Import translations. DO NOT MERGE
| | * am 5bf92ed7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | |/ |/| | | | | * commit '5bf92ed7d7b45cc45b42d6e5a66c8f794bcf5498': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-141-1/+1
|/ | | | | Change-Id: I1ed0f2d5455e9d59e7a584642a6e973b6b3ff6c0 Auto-generated-cl: translation import
* Updated navigation bar colorsMaurice Lam2014-08-103-8/+9
| | | | | Bug: 16919804 Change-Id: I47ea38e02b416b4ada5d626dc8802d326ddaffef
* SetupWizardNavBar Style fixesMaurice Lam2014-08-065-96/+45
| | | | | | | | | | | Nav bar buttons now use regular font, and the chevron is now created from converted SVGs from https://icons.googleplex.com/. Also used autoMirrored attribute for icons. Bug: 16851823 Bug: 16850334 Change-Id: Ic4c034f966a21f536da5aad1cb355602edc27cc4
* API REVIEW: VectorDrawableztenghui2014-07-254-20/+20
| | | | | | | | | | - Merge <size> and <viewport> attributes all in to top-level <vector> tag - Updata android:stroke to be android:strokeColor, likewise android:fill - Instead of android:clipToPath, make this a different clip-path tag. bug:16488254 Change-Id: I01b1fc053777f5b1ca9b2d8f3d81d1229e686570
* Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-198-48/+0
| | | | Change-Id: I6b99237ccc72e8cd0ae2183d46f6e771845f8a7c
* Import translations. DO NOT MERGEBaligh Uddin2014-07-068-0/+48
| | | | | Change-Id: I66fb471cbe5d0db545dc489face9f535c5d7edad Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-3017-0/+102
| | | | | Change-Id: I54832c9bf6c6c761ae6141e0420f01d0ee9ce3aa Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-06-2655-55/+0
| | | | | Change-Id: I7423aeda50e1bfd14041a7d97ea73e6012ec3ea4 Auto-generated-cl: translation import
* Merge "Navigation bar code cleanup"Maurice Lam2014-06-251-29/+18
|\
| * Navigation bar code cleanupMaurice Lam2014-06-241-29/+18
| | | | | | | | | | Bug: 15863755 Change-Id: I00876935be5cd374a9454ea053d0f899bfd8745c
* | Moved "more" resourcesMaurice Lam2014-06-242-30/+0
|/ | | | | Bug: 15863755 Change-Id: Ida5c75d324a53efc0de6fbdf00ad5f341452c091
* Merge "Make copyright headers consistent"Maurice Lam2014-06-208-103/+90
|\
| * Make copyright headers consistentMaurice Lam2014-06-208-103/+90
| | | | | | | | | | | | | | | | Fixed all the years to 2014, and all header to "The Android Open Source Project". Also fixed style so they are consistent within the project. Change-Id: I4b1c29a997a4f69c189bb94243db1e71b36c0f21
* | Add LOCAL_SDK_VERSION to makefileMaurice Lam2014-06-181-0/+1
|/ | | | | | Fix build for unbundled branches Change-Id: Ie2a8381785daa08225c9ca8a3fea64d32eaa8abb
* Update comment for SetupWizardNavBarMaurice Lam2014-06-161-3/+3
| | | | Change-Id: I660071b635a823fa44456cead3874131dbf66340
* fixbuild: Remove 'pinned' attr.Ruben Brunk2014-06-111-1/+1
| | | | | | | | | Needed by ag/481620 BUG: 15523923 BUG: 15473856 Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
* Merge "Material theme"Alan Viverette2014-06-061-1/+1
|\
| * Material themeAlan Viverette2014-06-061-1/+1
| | | | | | | | | | BUG: 15467097 Change-Id: I86f0df3fd0317216479304eb832def99602e1499
* | Add LAYOUT_HIDE_NAVIGATION to navigation barMaurice Lam2014-06-061-2/+14
|/ | | | | | | | | | Quantum theme moves the bar if LAYOUT_HIDE_NAVIGATION is not specified. Note that because of the way the framework is designed, this have the side effect of also applying LAYOUT_FULLSCREEN so contents may be behind the status bar. This will be fixed later when we enable the transparent status bar. Change-Id: I2403571711678f457da07b1e4645df1931612530
* Move navigationbar to frameworks/optMaurice Lam2014-06-0471-0/+890
| | | | | | | | | | | Move the navigationbar library project to frameworks/opt so that Settings (which cannot depend on vendor/google) can use it directly. Also renamed the package from com.google.android.setupwizard.navigationbar to com.android.setupwizard.navigationbar Change-Id: Ifdc099b3d23b6f1cb35d040b4b6e4d42a5cbf6de
* Initial empty repositoryQiwen Zhao2014-06-020-0/+0