Commit Graph

5724 Commits

Author SHA1 Message Date
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
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
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
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
80986508fc Import translations. DO NOT MERGE
Change-Id: I13501f8de184104974ced861598b0e87a52962f3
Auto-generated-cl: translation import
2014-12-01 06:36:03 -08:00
Jeff Davidson
c18dfd696e am a56714af: am 2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit 'a56714af6ea18d9c4299170644c53e89be025f84':
  Add string for "Connected via Wi-Fi assistant".
2014-11-26 23:52:57 +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
edfc6a0a5f am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit '628e89e94580cd0734fe9aa85065e58021e8e9d8':
  [Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 18:42:34 +00:00
Geoff Mendal
645cf17f68 Import translations. DO NOT MERGE
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
2014-11-26 06:25:44 -08:00
Maurice Lam
3f9d8b60ca Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 2014-11-26 01:15:36 +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
Lucky Zhang
e289815ec0 am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit '1d556fcca25a68e35536e3d668bfb24bd2b62d0d':
  [WifiSetup] Wifi setup text wrapping problem
2014-11-25 17:39:04 +00:00
Lucky Zhang
74896d6f1d Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 2014-11-24 19:33:13 +00:00
Geoff Mendal
faf1dd2062 Import translations. DO NOT MERGE
Change-Id: Ib35d3ce45d8d18a16ea37d1348a64ac621a54b1f
Auto-generated-cl: translation import
2014-11-24 10:07:28 -08:00
Lajos Molnar
8b2c19b578 am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
  Reword NuPlayer developer settings to say AwesomePlayer
2014-11-24 18:05:54 +00:00
Andres Morales
877e9de67b am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
  Update enable oem unlock warning
2014-11-24 18:05:33 +00:00
PauloftheWest
ac5c081adc Changed SIM lock toggle to a switch
Bug: 18408617
Change-Id: Iea14f40082aa9b7fd6c1925ee5ca5e6bc6841140
2014-11-23 17:19:49 -08:00
Lajos Molnar
5f9ee5e46c am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
* commit 'c3245a0555fbd9b02407edebfdac386a62a4af0a':
  Reword NuPlayer developer settings to say AwesomePlayer
2014-11-22 06:51:13 +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
e6d4aba3e1 am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
* commit '7090c92f3933238a06a6d799e49ae6b13d09cbb4':
  Update enable oem unlock warning
2014-11-22 03:32:52 +00:00
Andres Morales
7090c92f39 Merge "Update enable oem unlock warning" into lmp-mr1-dev 2014-11-22 03:28:45 +00:00
Lucky Zhang
39eb663c72 [WifiSetup] Wifi setup text wrapping problem
Fixed the text orientation for items in wifi settings on 600dp screens
in portrait mode. This bug only happens in such a setup, because
there is a mistake in the corresponding style file.

Bug: 18323509
Change-Id: I7ca6a3b27c8ab32481e02590f7ea78d452ab8090
2014-11-22 02:47:18 +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
626d1fc0f7 am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit 'c7e62cf149e98fe9da6f17e1dc43a7bb9ba256dc':
  Changing hint string inside sim name editor dialog in settings.
2014-11-21 23:42:05 +00:00
Sanket Padawe
c7e62cf149 am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit 'cd1846fa6bed76532bc66182fe6a9a87e6e7edd6':
  Changing hint string inside sim name editor dialog in settings.
2014-11-21 23:37:46 +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
d0d76e56af am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
* commit '37c3cd63a83a5e49686fc1eae25b2b2fc188991f':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
2014-11-21 21:48:06 +00:00
Lucky Zhang
37c3cd63a8 am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
* commit '0e606a2a301b91669af59e61f3e607463d49ed56':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
2014-11-21 21:44:47 +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