Commit Graph

7024 Commits

Author SHA1 Message Date
Sanket Padawe
77e9570b2b String changes for Cellular data toggle summary.
Bug: 17073752
Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
2015-06-11 13:31:39 -07:00
Jason Monk
02424dead1 am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev
* commit '0011604fd1f03125b22550f359997cc4922dd8bb':
  Clean up settings shortcuts
2015-06-11 20:05:39 +00:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2 Clean up settings shortcuts
- Remove some bad entries
 - Fix icons to be top-level item specific
 - Add memory

Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
2015-06-11 15:47:29 -04:00
Sanket Padawe
896bfa4987 am c129f7f8: am 5f7560f8: Fix button layout issue for sv-SE locale.
* commit 'c129f7f85a7e995bb7431b1283045e282dffad2c':
  Fix button layout issue for sv-SE locale.
2015-06-11 18:02:27 +00:00
Sanket Padawe
c129f7f85a am 5f7560f8: Fix button layout issue for sv-SE locale.
* commit '5f7560f856ffc5b8e1caab051e89810aff5ad498':
  Fix button layout issue for sv-SE locale.
2015-06-11 17:47:35 +00:00
Sanket Padawe
5f7560f856 Fix button layout issue for sv-SE locale.
Bug: 21479378
Change-Id: I4858958a26b183461490c052fece66941314edcc
2015-06-11 10:34:38 -07:00
Jeff Sharkey
b06835d19e am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev
* commit 'fae37744b1c70b2b7114eaaea500c8baeef5104a':
  Slow dialog string has no limit.
2015-06-11 16:47:38 +00:00
Jeff Sharkey
fae37744b1 am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev
* commit '0f6b243d4b0d2224b26852a4801d444afc9289d8':
  Slow dialog string has no limit.
2015-06-11 16:35:06 +00:00
Jeff Sharkey
0f6b243d4b Merge "Slow dialog string has no limit." into mnc-dev 2015-06-11 16:20:23 +00:00
Jeff Sharkey
9b0d09914b Slow dialog string has no limit.
Bug: 21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
2015-06-11 09:18:00 -07:00
Lorenzo Colitti
25566a38ce am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
* commit 'aab0a7781bf42d1e4ee9002749dfad55d25781f1':
  Add a string for switching to cell when Wi-Fi loses backhaul.
2015-06-11 12:52:11 +00:00
Lorenzo Colitti
aab0a7781b am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
* commit '1fdbbffceda141404ae033a471bea20de8df60d4':
  Add a string for switching to cell when Wi-Fi loses backhaul.
2015-06-11 03:19:06 +00:00
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Selim Cinek
a9f19dea44 am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
* commit '01dc50f54db68a3e48204bf858ae0acf95794bac':
  Added setting strings for new fingerprint introduction screen
2015-06-11 02:53:19 +00:00
Jeff Sharkey
72723306a1 am d10261eb: am 3803d91a: New strings!
* commit 'd10261eb7bafbce83cb9b106b515799edd2b7e8a':
  New strings!
2015-06-11 02:53:16 +00:00
Lajos Molnar
204f4068f7 am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
  developer settings: remove "Use deprecated AwesomePlayer" settings
2015-06-11 02:53:15 +00:00
Jorim Jaggi
6dd8e039da am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
* commit 'a66b907b1610ad67fd8c9b5746fa579bf886825c':
  Animations/success state for external confirm device credentials (2/2)
2015-06-11 02:53:13 +00:00
Selim Cinek
01dc50f54d am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
* commit 'ff702a29ab221b67b97b140263af19ebfecc1988':
  Added setting strings for new fingerprint introduction screen
2015-06-11 01:34:23 +00:00
Jeff Sharkey
d10261eb7b am 3803d91a: New strings!
* commit '3803d91abb1e6eb034656b202bbb4aa29afa98ba':
  New strings!
2015-06-11 01:33:32 +00:00
Lajos Molnar
f7192038dc am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
* commit '63504d832672c0738604410d3c309a563114b81e':
  developer settings: remove "Use deprecated AwesomePlayer" settings
2015-06-11 01:32:51 +00:00
Jorim Jaggi
a66b907b16 am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
* commit 'ed76e59e49657e6a49d140bfea8ddd764e5ba731':
  Animations/success state for external confirm device credentials (2/2)
2015-06-11 01:32:31 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
2015-06-10 18:08:16 -07:00
Jeff Sharkey
3803d91abb New strings!
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
2015-06-10 16:47:52 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Jason Monk
68ce17ff25 am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
* commit '3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
  New dialog for ignore battery optimizations
2015-06-10 23:15:28 +00:00
Jason Monk
efb955f3f5 am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning
* commit 'ef77eb2ecc96936854d5b3473591dfaca16e0ae7':
  Add string for profile owner usage access warning
2015-06-10 23:15:05 +00:00
Jeff Brown
c568dab675 am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit 'f7b9a0217cc0cfb0bb35811465a560fad8cf8786':
  Add simulated 4K display modes.
2015-06-10 23:14:44 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2)
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00
Jason Monk
3de2cf4b2f am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
* commit 'd09be7ed30d2ed4f3298c3075f506612b91a5878':
  New dialog for ignore battery optimizations
2015-06-10 20:14:34 +00:00
Jason Monk
d09be7ed30 Merge "New dialog for ignore battery optimizations" into mnc-dev 2015-06-10 20:06:12 +00:00
Jason Monk
ef77eb2ecc am f8d131e1: Add string for profile owner usage access warning
* commit 'f8d131e181a273ed8664222e754b10a5824d56ac':
  Add string for profile owner usage access warning
2015-06-10 19:55:01 +00:00
Jason Monk
3a90d7cc69 New dialog for ignore battery optimizations
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
2015-06-10 15:49:36 -04:00
Jeff Brown
f7b9a0217c am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit 'f8f9088a6def1186038c35ec3319113262825f20':
  Add simulated 4K display modes.
2015-06-10 19:33:02 +00:00
Jason Monk
f8d131e181 Add string for profile owner usage access warning
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +00:00
Xiyuan Xia
67b438b118 am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev
* commit 'a218ebb090e3ac06d5c324bafb89e2d4d3ef7741':
  Implement default assist app setting
2015-06-10 17:32:43 +00:00
Xiyuan Xia
a218ebb090 am 9823f279: Merge "Implement default assist app setting" into mnc-dev
* commit '9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
  Implement default assist app setting
2015-06-10 17:21:01 +00:00
Xiyuan Xia
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +00:00
Makoto Onuki
2f951024e4 am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
* commit 'c81dad78ea6ecf5819f07790126ba7424b7a7499':
  Show list of permissions instead of just numbers
2015-06-10 17:00:06 +00:00
Makoto Onuki
c81dad78ea am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
* commit '0bd18745cff354f6994b70e71f3ab6b7e98fe004':
  Show list of permissions instead of just numbers
2015-06-10 16:51:24 +00:00
Makoto Onuki
0bd18745cf Merge "Show list of permissions instead of just numbers" into mnc-dev 2015-06-10 16:39:07 +00:00
Lorenzo Colitti
24f4829994 am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
* commit 'a41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
2015-06-10 15:56:36 +00:00
Jason Monk
8ff3e055b0 am fba2680e: am f9402321: Fix legal info back button
* commit 'fba2680ebb63f0195b3267b7dec8d9cc413896fd':
  Fix legal info back button
2015-06-10 15:56:34 +00:00
Xiyuan Xia
86a554091d Implement default assist app setting
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
2015-06-10 08:43:28 -07:00
Lorenzo Colitti
a41c3580a9 am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
* commit '275e6f75208c08eb925048a330ed4aab96e51033':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
2015-06-10 15:42:35 +00:00
Jason Monk
fba2680ebb am f9402321: Fix legal info back button
* commit 'f94023216accd128b06acdc50950e455a60a9c4e':
  Fix legal info back button
2015-06-10 15:42:16 +00:00