Commit Graph

20896 Commits

Author SHA1 Message Date
Sanket Padawe
4acd0048e7 am c0d30052: am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev
* commit 'c0d3005232e9a9d4745cf51838af5e60a36d13dc':
  String changes for PBAP chekcbox in BT pairing dialog.
2015-06-11 22:17:20 +00:00
Jeff Sharkey
a48e4fd9ed am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
* commit '41b7468feb96ac51f494abc5414f7f02e801ed97':
  Always round migration times up to 1 second.
2015-06-11 22:17:19 +00:00
Sanket Padawe
c0d3005232 am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev
* commit '9d7971a9e2f069c200864bac86173de6276b6da8':
  String changes for PBAP chekcbox in BT pairing dialog.
2015-06-11 21:54:50 +00:00
Jeff Sharkey
41b7468feb am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
* commit 'f25fc9cb6798d04593c4fd28f8542a7884f66e5f':
  Always round migration times up to 1 second.
2015-06-11 21:54:17 +00:00
Sanket Padawe
9d7971a9e2 Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 2015-06-11 21:29:31 +00:00
Jason Monk
1c4dcb0315 am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev
* commit '02424dead1be6877d11bf30ba87e2b97dc9042d1':
  Clean up settings shortcuts
2015-06-11 21:11:02 +00:00
Jeff Sharkey
f25fc9cb67 Merge "Always round migration times up to 1 second." into mnc-dev 2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a Always round migration times up to 1 second.
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
2015-06-11 13:43:56 -07:00
Sanket Padawe
0d9e167b07 String changes for PBAP chekcbox in BT pairing dialog.
Bug: 20488109
Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
2015-06-11 13:37:55 -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
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
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
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