Commit Graph

2890 Commits

Author SHA1 Message Date
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
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
67f105bc98 [FRP] Give pattern lock colors
Bug: 18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
2014-12-04 14:30:52 -08: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
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
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
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
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
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
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
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
Jeff Davidson
81c5b3f355 am c18dfd69: am a56714af: am 2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit 'c18dfd696e843892ca378319bfc4da60e7c61f3e':
  Add string for "Connected via Wi-Fi assistant".
2014-11-27 00:00:15 +00:00
Jeff Davidson
2d93f36f00 Add string for "Connected via Wi-Fi assistant".
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
2014-11-26 15:37:07 -08:00
Maurice Lam
66e911fb02 am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 19:56:48 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
PauloftheWest
256d83dc7a Remove extraneous SIM status information
Bug: 18467248
Change-Id: I59aff3f979f76ca622a6a9e944398042f236f0b7
2014-11-25 12:36:40 -08:00
Lajos Molnar
0a03478cea am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
  Reword NuPlayer developer settings to say AwesomePlayer
2014-11-24 18:12:16 +00:00
Andres Morales
ee47e0219e am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
  Update enable oem unlock warning
2014-11-24 18:12:15 +00:00
Lajos Molnar
c3245a0555 Reword NuPlayer developer settings to say AwesomePlayer
Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
2014-11-21 21:51:29 -08:00
Andres Morales
7090c92f39 Merge "Update enable oem unlock warning" into lmp-mr1-dev 2014-11-22 03:28:45 +00:00
Andres Morales
26b46882cb Update enable oem unlock warning
updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
2014-11-21 16:42:57 -08:00
Sanket Padawe
1eb838ec83 am 626d1fc0: am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit '626d1fc0f78aa634778b7cc1ac860c35f6a83213':
  Changing hint string inside sim name editor dialog in settings.
2014-11-22 00:00:30 +00:00
Sanket Padawe
cd1846fa6b Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 2014-11-21 23:32:51 +00:00
Lucky Zhang
72c70cb098 am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
* commit 'd0d76e56af9c75b75d8f08c2ba77577e2745a382':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
2014-11-21 23:13:37 +00:00
Maurice Lam
a78fbb48ce am 80e29675: am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev
* commit '80e2967529cf0bb75cb43881931bf4516e28bbd2':
  [WifiSetup] Update title string
2014-11-21 23:13:32 +00:00
Lucky Zhang
0e606a2a30 Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev 2014-11-21 21:40:44 +00:00
Maurice Lam
485a7e5989 Merge "[WifiSetup] Update title string" into lmp-mr1-dev 2014-11-21 21:33:41 +00:00
Maurice Lam
01aab29343 [WifiSetup] Update title string
Bug: 17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43
2014-11-21 11:59:34 -08:00
Lucky Zhang
91527920ff [SetupWizard] Warn user of missing FRP if skipping wi-fi
Change the skip string in wifi settings to warn user of missing
out on device protection.

Bug: 18391349
Change-Id: Ica2434589ece60205cd9a06088a8eb65d5edfd0d
2014-11-21 18:37:00 +00:00
Zoltan Szatmary-Ban
9986ca49d6 am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
  Remove backup preferences if backup service is inactive
2014-11-21 15:37:25 +00:00
Zoltan Szatmary-Ban
61d0017cc1 am cf8255a0: am ad8191d9: am b85025d9: Strings for multiprofile Location Settings.
* commit 'cf8255a0b150118a4c1f8703fe49d333d3fe0298':
  Strings for multiprofile Location Settings.
2014-11-21 15:28:04 +00:00
Zoltan Szatmary-Ban
5875aefa8a Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 2014-11-21 15:21:34 +00:00
Zoltan Szatmary-Ban
b85025d98b Strings for multiprofile Location Settings.
Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
2014-11-21 15:10:23 +00:00
Jeff Davidson
f73f5b6d63 am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev
automerge: 32b7def

* commit '32b7def42f912ea527427892f4d95d277e4851fc':
  Final strings for Wi-Fi Assistant in platform settings.
2014-11-21 01:55:01 +00:00
Zoltan Szatmary-Ban
2a7a9f6b9e am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
  Show managed profile accounts on Settings > Factory Reset
2014-11-20 21:29:12 +00:00
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
2014-11-20 20:20:49 +00:00
Jeff Davidson
101743f9ec Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 2014-11-20 18:37:53 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Sanket Padawe
d0c0a479b0 Changing hint string inside sim name editor dialog in settings.
Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff
2014-11-19 16:50:28 -08:00