Commit Graph

6577 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
f84c6ee01c Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 2014-12-08 12:50:11 +00:00
Maurice Lam
8fcbe81665 am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
* commit '400e93785016cce831b14990365ab7636b846648':
  [FRP] Don't extract IME for PIN / Password during setup
2014-12-06 03:10:19 +00:00
Maurice Lam
400e937850 Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev 2014-12-06 03:03:56 +00:00
Sanket Padawe
889d3875af am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
* commit '6d0059c3f998a86b1726949525d3501d5b7cf589':
  Change default sim selection text in sim settings ui.
2014-12-05 21:03:35 +00:00
Sanket Padawe
6d0059c3f9 Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 2014-12-05 20:55:29 +00:00
Zoltan Szatmary-Ban
86c877e9b6 Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location

Bug: 18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
2014-12-05 19:40:59 +00:00
Maurice Lam
4170f0e567 [FRP] Don't extract IME for PIN / Password during setup
Add the flagNoExtractUi to the password / PIN entry field so that it
will not be extracted to a fullscreen mode in phone landscape.

The phone landscape UI currently provides a poor experience because
it masks the message shown to the user (e.g. Passwords require at
least 4 characters)

Bug: 18640065
Change-Id: If67c8f9ae761f1ffda4f841e421e0fd651651649
2014-12-05 11:14:01 -08:00
Sanket Padawe
9a73365ed7 am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '76fd9d62facb2c683b69c2e4280534abdb2281bd':
  Removed unnecessary heading in Sim settings
2014-12-05 16:26:39 +00:00
Sanket Padawe
76fd9d62fa am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '669d4e4fce68d3f8e6391fab5d4e60e358234767':
  Removed unnecessary heading in Sim settings
2014-12-05 15:52:03 +00:00
Maurice Lam
ecf2f401e9 am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
* commit '2c0c983755903bf9c0a5cb276c64ed7cf4557464':
  [FRP] Use setup wizard nav bar buttons
2014-12-05 03:27:17 +00:00
Maurice Lam
2c0c983755 Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 2014-12-05 03:21:53 +00:00
Maurice Lam
40a252ce49 am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
* commit 'dfaf4c92c19356116267cf9c61168414d817b9a7':
  [FRP] Add illustration to lock screen setup
2014-12-05 00:32:53 +00:00
Maurice Lam
dfaf4c92c1 Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 2014-12-05 00:23:00 +00:00
Amith Yamasani
0c8a2d63be am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit 'a7ddb536fd9ed69f8436f1f786ca576fd34effa3':
  Fix padding in user type selection dialog
2014-12-05 00:14:14 +00:00
Maurice Lam
7b6801af7c am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit '73a68c0727fbc2caa85109eea17e2b583c5905c1':
  [FRP] Transitions for lock screen setup
2014-12-05 00:14:13 +00:00
PauloftheWest
2b2019255e am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '753a00e057201ad319bf85487beb1c6329bf1a05':
  Add SIM notification pop-ups.
2014-12-05 00:14:10 +00:00
Maurice Lam
b6f5e003a9 am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit '13989d6d9f25a5d09d68dfc98b31595e8e6b8425':
  [FRP] Give pattern lock colors
2014-12-04 23:13:50 +00:00
Sanket Padawe
3c72c817f8 Change default sim selection text in sim settings ui.
Bug: 18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
2014-12-04 23:08:00 +00:00
Maurice Lam
13989d6d9f Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 2014-12-04 23:04:37 +00:00
Maurice Lam
67f105bc98 [FRP] Give pattern lock colors
Bug: 18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
2014-12-04 14:30:52 -08:00
Amith Yamasani
a7ddb536fd am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit '53e8940b94a7b508659b84fd9037f922f1d4a50f':
  Fix padding in user type selection dialog
2014-12-04 21:47:15 +00:00
Maurice Lam
73a68c0727 am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit '45f44ad7e31b3ef8f4e3f4b5bd43cc215e712b9f':
  [FRP] Transitions for lock screen setup
2014-12-04 21:47:14 +00:00
PauloftheWest
753a00e057 am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '06ddf97c4da204e62a5427c8e22643c267c1d9ed':
  Add SIM notification pop-ups.
2014-12-04 21:47:11 +00:00
Maurice Lam
af103b4eb4 [FRP] Use setup wizard nav bar buttons
Use setup wizard nav bar buttons instead of custom button bar for
lock screen setup.

Bug: 18482708
Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
2014-12-04 12:20:47 -08:00
Sanket Padawe
669d4e4fce am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '91a4deb5e9cc957918c2e27e509300f3015c72d6':
  Removed unnecessary heading in Sim settings
2014-12-04 18:19:11 +00:00
Sanket Padawe
91a4deb5e9 Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 2014-12-04 18:12:41 +00:00
Amith Yamasani
53e8940b94 am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit '6ff07c418ff171296e763a6658fe4b7f49e12871':
  Fix padding in user type selection dialog
2014-12-04 15:17:52 +00:00
Maurice Lam
45f44ad7e3 am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit 'a3dff74e59b29fdff63810e55c27207a8354c935':
  [FRP] Transitions for lock screen setup
2014-12-04 15:17:51 +00:00
PauloftheWest
06ddf97c4d am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit 'e8a868f26616f59206eba19c0b08ad4c99882b8c':
  Add SIM notification pop-ups.
2014-12-04 15:17:48 +00:00
Geoff Mendal
63042047d4 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:51:22 +00:00
Geoff Mendal
3f5fd1feba Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 05:46:51 +00:00
Maurice Lam
1227a19ecc [FRP] Add illustration to lock screen setup
Added the illustration JPG files, and added
SetupWizardUtils.setIllustration method that will change the
illustrations in the layout.

Bug: 18482708
Change-Id: I8c6758113f07cd33f85eaf6bc019e8194d9a17ce
2014-12-03 21:19:21 -08:00
Amith Yamasani
6ff07c418f Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 2014-12-04 01:50:05 +00:00
Maurice Lam
a3dff74e59 Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 2014-12-04 00:25:23 +00:00
Maurice Lam
784f02720e [FRP] Transitions for lock screen setup
Use the slide transition for activities using the setup theme.

Bug: 18482708
Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7
2014-12-03 16:18:13 -08:00
PauloftheWest
e8a868f266 Merge "Add SIM notification pop-ups." into lmp-mr1-dev 2014-12-03 23:30:53 +00:00
Sanket Padawe
3b72ead136 Removed unnecessary heading in Sim settings
Bug: 17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
2014-12-03 15:23:14 -08:00
Amith Yamasani
f3db021ba5 Fix padding in user type selection dialog
Use preferred list item padding for the list items
and use the dialog context for creating the adapter.

Bug: 18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
2014-12-03 14:20:05 -08:00
Sanket Padawe
c88fab28b2 am 09d2676c: am fc82a3de: am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
* commit '09d2676cab013c4b7e4352c8d956ebf0436ad631':
  Fixed improper capitalization related to trademark term in BT
2014-12-03 21:52:29 +00:00
Sanket Padawe
717c872ad3 am 4633e152: am 9e878b1b: am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '4633e152c80ac60f83e2e0d0db3e3b93d6928c66':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
2014-12-03 21:52:25 +00:00
Maurice Lam
ec957dfcf7 am 2ecc0107: am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '2ecc0107dcc939bd4e3b9f4c4359f9845cae1b82':
  [FRP] Theme interstitials for lock screen setup
2014-12-03 21:52:23 +00:00
Geoff Mendal
4c40383885 Import translations. DO NOT MERGE
Change-Id: Ic22c5b6d3187254593d57008979abaad26fd5c3d
Auto-generated-cl: translation import
2014-12-03 13:01:49 -08:00
Geoff Mendal
4a66e6d4c4 Import translations. DO NOT MERGE
Change-Id: I7a5232779f658029d1d30c4534e5e040d831b012
Auto-generated-cl: translation import
2014-12-03 12:51:33 -08:00
Sanket Padawe
09d2676cab am fc82a3de: am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
* commit 'fc82a3dea618a71d792a709d4f3580598aca2545':
  Fixed improper capitalization related to trademark term in BT
2014-12-03 20:40:06 +00:00
Sanket Padawe
4633e152c8 am 9e878b1b: am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '9e878b1b3a32388f82ba6c2c75343d8d04f6cb7c':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
2014-12-03 20:40:03 +00:00
Maurice Lam
2ecc0107dc am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '94c85309b297e5c63d54b9a76f27e9119779411e':
  [FRP] Theme interstitials for lock screen setup
2014-12-03 20:40:02 +00:00
Geoff Mendal
dfa34df936 Import translations. DO NOT MERGE
Change-Id: I09102039883ee5ee63f0f58f26ea2a2239b8d047
Auto-generated-cl: translation import
2014-12-03 12:39:08 -08:00
Sanket Padawe
fc82a3dea6 am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
* commit 'ef4d17910673709977624ff6d9e8ec499e3ac2fa':
  Fixed improper capitalization related to trademark term in BT
2014-12-03 02:29:06 +00:00
Sanket Padawe
9e878b1b3a am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '430e01d01fb8ab51a4975d8f8d46760c7873f425':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
2014-12-03 02:29:02 +00:00
Maurice Lam
94c85309b2 am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '7b484b9af07aa92c530312507ee9a8ea85b00198':
  [FRP] Theme interstitials for lock screen setup
2014-12-03 02:28:58 +00:00