Commit Graph

22375 Commits

Author SHA1 Message Date
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
Jason Monk
24da852968 am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
* commit 'ac6bb3c23b6d2e0b4bd6003a3c6fbda8f6ba0a0c':
  App storage settings - Request size onResume
2015-06-10 23:15:30 +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
Lucky Zhang
34450932b2 Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev 2015-06-10 23:01:26 +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
Paul Crowley
6904e5fa9c Add ellipsis to "Starting Android".
Bug: 20518822
Change-Id: I04f8380ca585680901a65b0741456f5ff44b3c0a
2015-06-10 22:25:46 +01:00
Nick Kralevich
d9bd6a6576 am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev
* commit '8da8e528748fccf4b2291536592648a8e99a36d6':
  Fix USB access control when adb is disabled.
2015-06-10 21:25:35 +00:00
Nick Kralevich
8da8e52874 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:35 +00:00
Jason Monk
c58845442a am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
* commit 'a576d55a0e941e1f06c5edffcbcbaa8d01fc2b64':
  Hide tap to wake on devices that don't support it
2015-06-10 20:38:52 +00:00
Jason Monk
a576d55a0e Merge "Hide tap to wake on devices that don't support it" into mnc-dev 2015-06-10 20:26:12 +00:00
Jason Monk
181e0e9ec0 Hide tap to wake on devices that don't support it
Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
2015-06-10 16:16:10 -04:00
Jason Monk
ac6bb3c23b am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
* commit 'dc748cb38ac79fb445d7bbba6f8220a85820d03a':
  App storage settings - Request size onResume
2015-06-10 20:14:35 +00: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
dc748cb38a Merge "App storage settings - Request size onResume" into mnc-dev 2015-06-10 20:12:07 +00:00
Jason Monk
ece9d5145f App storage settings - Request size onResume
Our data might be stale (especially when coming from manage space
activities).

Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
2015-06-10 16:08:01 -04: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