Commit Graph

7054 Commits

Author SHA1 Message Date
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
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
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
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
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
f9154eef73 Import translations. DO NOT MERGE
Change-Id: I36312c2e5f3bf38ba107336920aae2083e75d0bb
Auto-generated-cl: translation import
2014-11-26 06:49:26 -08: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
a162bd7651 am e289815e: am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit 'e289815ec02d30e9fe47197141efe141b68f6ba8':
  [WifiSetup] Wifi setup text wrapping problem
2014-11-25 17:49:55 +00: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
4def38c32c Merge "Import translations. DO NOT MERGE" 2014-11-24 18:34:51 +00:00
Geoff Mendal
7c128a2601 Import translations. DO NOT MERGE
Change-Id: Ieeb1625c68eca3c1777c3adbc48853231c685c62
Auto-generated-cl: translation import
2014-11-24 10:31:25 -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
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
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
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
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
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
Maurice Lam
80e2967529 am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev
* commit '3b1baf4b18c8176ba76d4527cb5740c0ace2cf91':
  [WifiSetup] Update title string
2014-11-21 21:40:38 +00:00
Maurice Lam
3b1baf4b18 am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev
* commit '485a7e5989823ff30e6ef61064a592d42f49a1f0':
  [WifiSetup] Update title string
2014-11-21 21:36:22 +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
3da30aabf1 am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
* commit '208a8490c9fe6cfa3899c8c41f95afa539863711':
  Remove backup preferences if backup service is inactive
2014-11-21 15:32:33 +00:00
Zoltan Szatmary-Ban
208a8490c9 am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
* commit '5875aefa8a48cd90a1245303c42c171c2f4962b4':
  Remove backup preferences if backup service is inactive
2014-11-21 15:29:01 +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
cf8255a0b1 am ad8191d9: am b85025d9: Strings for multiprofile Location Settings.
* commit 'ad8191d95e4dfa296f276e68647e216502bf4d36':
  Strings for multiprofile Location Settings.
2014-11-21 15:23:31 +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
ad8191d95e am b85025d9: Strings for multiprofile Location Settings.
* commit 'b85025d98b7c9d28c9ee2b26ce3c9d11929aeb3a':
  Strings for multiprofile Location Settings.
2014-11-21 15:18:59 +00:00
Zoltan Szatmary-Ban
b85025d98b Strings for multiprofile Location Settings.
Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
2014-11-21 15:10:23 +00:00