Commit Graph

21191 Commits

Author SHA1 Message Date
Jeff Sharkey
42ef2461b9 am b06835d1: am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev
* commit 'b06835d19eb5d2e416cf85604746388a754c42e9':
  Slow dialog string has no limit.
2015-06-11 17:09:30 +00:00
John Spurlock
e90d20fbba am 6b2adf6e: am eed22852: am fca81cd2: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
* commit '6b2adf6e4e121248b45f6897f97d416bb9f80fc4':
  Settings: Follow frameworks change to volume sliders.
2015-06-11 17:08:45 +00:00
Lorenzo Colitti
fbc3f62e7e am 25566a38: am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
* commit '25566a38ce9c6f2fb32745c9ece82528b5c30478':
  Add a string for switching to cell when Wi-Fi loses backhaul.
2015-06-11 17:07:47 +00: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
John Spurlock
6b2adf6e4e am eed22852: am fca81cd2: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
* commit 'eed2285257b9ae6b09d3dc36425578634f9fed27':
  Settings: Follow frameworks change to volume sliders.
2015-06-11 14:30:42 +00:00
John Spurlock
eed2285257 am fca81cd2: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
* commit 'fca81cd233f749e71b63a41561e3010d21ecc733':
  Settings: Follow frameworks change to volume sliders.
2015-06-11 14:16:56 +00:00
John Spurlock
fca81cd233 Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev 2015-06-11 14:08:46 +00:00
John Spurlock
f82154de8c Settings: Follow frameworks change to volume sliders.
Bug: 21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
2015-06-11 10:06:30 -04: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
Sanket Padawe
9761a97ff4 am baf0db3d: am 00c5226d: am 1d220f62: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
* commit 'baf0db3d2b7539378505bac359aef975443c3f92':
  Fix SimPreference dialog from closing on orientation change.
2015-06-11 05:56:20 +00:00
Selim Cinek
38b48086bc am a9f19dea: am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
* commit 'a9f19dea4472a76d7c6ec280ff1a0da6a7e64c0e':
  Added setting strings for new fingerprint introduction screen
2015-06-11 05:56:19 +00:00
Jeff Sharkey
08057f035d am bfd717b1: am 3b47da58: am 680329f1: Follow string refactoring.
* commit 'bfd717b150301ef57e5fc10ff6eb2e954256f9d0':
  Follow string refactoring.
2015-06-11 05:56:18 +00:00
Jeff Sharkey
59adbd9027 am 72723306: am d10261eb: am 3803d91a: New strings!
* commit '72723306a18b4148240e98bff8cb0f78004d76e7':
  New strings!
2015-06-11 05:56:16 +00:00
Lajos Molnar
8f45270634 am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings
2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)
2015-06-11 05:56:12 +00:00
Lucky Zhang
34eaaa01fa am 234c4c6c: am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
* commit '234c4c6c7c7e4a5b82c3f88d4343da10912eab98':
  [Settings] Pass lock type extra back to SUW
2015-06-11 05:56:10 +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
Sanket Padawe
baf0db3d2b am 00c5226d: am 1d220f62: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
* commit '00c5226d6f7aad21e85c06808961eb97e01e982d':
  Fix SimPreference dialog from closing on orientation change.
2015-06-11 02:54:24 +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
bfd717b150 am 3b47da58: am 680329f1: Follow string refactoring.
* commit '3b47da581b2c05f00a2d9f5d3cd0f10fb786c7e6':
  Follow string refactoring.
2015-06-11 02:53:17 +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
Lucky Zhang
234c4c6c7c am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
* commit 'ab21c7fa458e8aeabeef22096e304fd0c9a484da':
  [Settings] Pass lock type extra back to SUW
2015-06-11 02:53:12 +00:00
Sanket Padawe
00c5226d6f am 1d220f62: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
* commit '1d220f624279026e8d23d2041e7d243b6605c2f8':
  Fix SimPreference dialog from closing on orientation change.
2015-06-11 02:10:25 +00:00
Sanket Padawe
1d220f6242 Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 2015-06-11 01:41:21 +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
Nick Kralevich
d01f0d91ef am 54d37cdd: am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev
* commit '54d37cddc6a8986e5966fc6058e0f1dcd6d808cd':
  Fix USB access control when adb is disabled.
2015-06-11 01:34:11 +00:00
Jason Monk
938ffbf0dc am 3b145d90: am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
* commit '3b145d9086fb46a0d20c2724dac6ae8ef1e24400':
  Hide tap to wake on devices that don't support it
2015-06-11 01:34:10 +00:00
Jason Monk
f14f4509f9 am 24da8529: am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
* commit '24da85296897a4130961491978e7b339e5f77a37':
  App storage settings - Request size onResume
2015-06-11 01:34:09 +00:00
Jason Monk
25326207d3 am 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
* commit '68ce17ff25b497edb7e0ec20a672475b76e604c8':
  New dialog for ignore battery optimizations
2015-06-11 01:34:07 +00:00
Jason Monk
19291d5a89 am efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning
* commit 'efb955f3f5689062da6e326c6277e1a3758d5436':
  Add string for profile owner usage access warning
2015-06-11 01:34:06 +00:00
Jeff Brown
56dd84cb61 am c568dab6: am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit 'c568dab675e3024c64f9be47f7831181b8889d20':
  Add simulated 4K display modes.
2015-06-11 01:34:05 +00:00
Jeff Sharkey
3b47da581b am 680329f1: Follow string refactoring.
* commit '680329f10c9ed4648ff9233f9410e22eedf30dfe':
  Follow string refactoring.
2015-06-11 01:33:48 +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
Lucky Zhang
ab21c7fa45 am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
* commit '34450932b28565edfe3009dfdb2f92476c11671a':
  [Settings] Pass lock type extra back to SUW
2015-06-11 01:32:09 +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
Sanket Padawe
f6f43e4c45 Fix SimPreference dialog from closing on orientation change.
Bug: 19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
2015-06-10 17:46:31 -07:00
Jeff Sharkey
680329f10c Follow string refactoring.
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
2015-06-10 17:27:44 -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
Nick Kralevich
54d37cddc6 am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev
* commit 'd9bd6a65769633548ffd3f281743c112a946a84d':
  Fix USB access control when adb is disabled.
2015-06-10 23:16:38 +00:00
Jason Monk
3b145d9086 am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
* commit 'c58845442a94bd7d4945cb1d28aec673b29c338b':
  Hide tap to wake on devices that don't support it
2015-06-10 23:15:36 +00:00