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
Sanket Padawe
ef4d179106
Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
2014-12-03 01:36:10 +00:00
Sanket Padawe
430e01d01f
Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
2014-12-03 01:31:43 +00:00
Maurice Lam
7b484b9af0
Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
2014-12-03 01:27:57 +00:00
Baligh Uddin
1870158732
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:26:37 +00:00
Baligh Uddin
ebb64630ae
Import translations. DO NOT MERGE
...
Change-Id: If02762d2b4f971f8ad83922eade1a2a8b85adca8
Auto-generated-cl: translation import
2014-12-02 17:01:39 -08:00
PauloftheWest
ffef98b3a0
Add SIM notification pop-ups.
...
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.
Bug: 18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
2014-12-02 16:35:32 -08:00
Lucky Zhang
97f70e7263
am 23ab054d: am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
...
* commit '23ab054dd94a639ca43e011b931eb12c5122c596':
[FRP] Show FRP warning when disabling secure unlock
2014-12-03 00:32:01 +00:00
PauloftheWest
1d0667a07b
am 50bbce77: am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
...
* commit '50bbce771324a264f720e402615fe6555b6c6e3b':
Changed SIM lock toggle to a switch
2014-12-03 00:29:33 +00:00
Lucky Zhang
23ab054dd9
am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
...
* commit '955f412c4ba854c965f2aaf7ba96b4cda43b99b9':
[FRP] Show FRP warning when disabling secure unlock
2014-12-03 00:01:31 +00:00
Lucky Zhang
91177d1c16
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
2014-12-02 23:45:56 +00:00
Sanket Padawe
a04d07cc75
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
...
Bug: 17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1
2014-12-02 15:40:23 -08:00
PauloftheWest
50bbce7713
am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
...
* commit 'cbf347c42d06e27785ccde70763a2c4dbc45542d':
Changed SIM lock toggle to a switch
2014-12-02 21:34:58 +00:00
PauloftheWest
794cbd70fa
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
2014-12-02 21:19:52 +00:00
PauloftheWest
53a1e8ce6d
am 506607d1: am 21316f1d: am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
...
* commit '506607d1f8c9b05b230e3031e41c2d97f1c78e28':
Remove extraneous SIM status information
2014-12-02 18:12:01 +00:00
PauloftheWest
506607d1f8
am 21316f1d: am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
...
* commit '21316f1d1aedaffbd9f882f4cecdf518e8521212':
Remove extraneous SIM status information
2014-12-02 18:04:15 +00:00
PauloftheWest
41c2962552
Merge "Remove extraneous SIM status information" into lmp-mr1-dev
2014-12-02 17:50:31 +00:00
Maurice Lam
ecd2b7b81f
[FRP] Theme interstitials for lock screen setup
...
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.
Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
2014-12-01 20:24:08 -08:00
Lucky Zhang
3bcea0289b
[FRP] Show FRP warning when disabling secure unlock
...
Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.
Bug: 18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee
2014-12-01 18:49:10 -08:00
Maurice Lam
fcdc4dd32c
am 72b29f9b: am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens
...
* commit '72b29f9b7f6e9a0c0b9f8313df8897b29481292e':
[FRP] Theming for Pattern and Password screens
2014-12-02 01:35:45 +00:00
Maurice Lam
72b29f9b7f
am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens
...
* commit '86f184b3d66af3db1302471c44441e1d2dc1867e':
[FRP] Theming for Pattern and Password screens
2014-12-02 01:13:08 +00:00
Maurice Lam
6b19fa9017
[FRP] Theming for Pattern and Password screens
...
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.
This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.
Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
2014-12-01 16:18:27 -08:00
Sanket Padawe
7666b547bf
Fixed improper capitalization related to trademark term in BT
...
Bug: 18362051
Change-Id: I3074e120a5b261fbcb5d429bae47d233ad6fd695
2014-12-01 19:53:53 +00:00
Geoff Mendal
2dd40e7ec8
Import translations. DO NOT MERGE
...
Change-Id: I937420a98ee4ffd48c61126f1cec59978043c5d3
Auto-generated-cl: translation import
2014-12-01 07:00:28 -08:00