PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,751 Commits 1 Branch 0 Tags
38c819072c54c37c7d4aa9038f4f6b13a38053f9
Commit Graph

21751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
38c819072c am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
  Show storage slow dialog allowing state loss.
 2015-08-14 01:24:29 +00:00
Jeff Sharkey
ae531f1f61 Merge "Show storage slow dialog allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Jeff Sharkey
0814827e8f Show storage slow dialog allowing state loss. 
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.

Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.

Bug: 22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
 2015-08-13 16:57:48 -07:00
Geoff Mendal
36fe2c6a13 am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
  Import translations. DO NOT MERGE
 2015-08-13 06:58:22 +00:00
Geoff Mendal
eea96f22a1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
 2015-08-12 21:50:09 -07:00
Dianne Hackborn
df85a4fc21 am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:57:45 +00:00
Dianne Hackborn
f67d0785d0 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I003564376a02a70f0245353472544cde355240ac
 2015-08-12 16:11:46 -07:00
Andres Morales
af48dffe4f am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
  [ConfirmPattern] use correct user id for stealth mode
 2015-08-11 23:35:46 +00:00
Andres Morales
9f879ef009 Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 2015-08-11 23:31:23 +00:00
Dianne Hackborn
7f45b55dd8 am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:26:52 +00:00
Dianne Hackborn
8500822b8e Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 2015-08-11 23:17:24 +00:00
Andres Morales
b56324b149 [ConfirmPattern] use correct user id for stealth mode 
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
 2015-08-11 23:17:17 +00:00
Maurice Lam
ef90693895 am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
  [Fingerprint] Use different ring size for setup
 2015-08-11 22:43:15 +00:00
Maurice Lam
3d9cb92618 Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 2015-08-11 22:35:53 +00:00
Dianne Hackborn
4f8b829b24 Fix issue #23079119: Description for write settings permission says... 
...it is for read and write

Just write.

And let's say, modify.

Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
 2015-08-11 12:17:59 -07:00
Dianne Hackborn
ef54ab616a am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:17:11 +00:00
Dianne Hackborn
f664947291 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:12:59 +00:00
Dianne Hackborn
be4df036e1 Fix issue #23037899: Support for Battery Optimization permission + Dialog 
New pretty dialog.

Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
 2015-08-10 17:07:14 -07:00
Dianne Hackborn
ba38155d25 Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-11 00:06:43 +00:00
Dianne Hackborn
9bedd25c77 Fix issue #23037720: New Battery Optimization Strings 
No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
 2015-08-10 17:03:38 -07:00
Dianne Hackborn
6aeabbf2d2 am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-10 22:03:37 +00:00
Dianne Hackborn
996e285cdc Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-10 21:55:23 +00:00
Julia Reynolds
0a27e57dd9 am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.
 2015-08-10 20:38:15 +00:00
Julia Reynolds
2557d8a251 Merge "Wrap text on long preferences." into mnc-dev 2015-08-10 20:32:49 +00:00
Jason Monk
656145a0e0 am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:23:14 +00:00
Jason Monk
cf1e22f447 Merge "Remove extra help & feedback menu from power usage" into mnc-dev 2015-08-10 20:09:20 +00:00
Jason Monk
3006c377c2 Remove extra help & feedback menu from power usage 
Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
 2015-08-10 15:58:09 -04:00
Pavel Zhamaitsiak
667be5d6bf am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
  Ensure that listener is removed only if it was added
 2015-08-10 17:35:09 +00:00
Pavel Zhamaitsiak
8cf5426499 Merge "Ensure that listener is removed only if it was added" into mnc-dev 2015-08-10 17:29:38 +00:00
Jeff Sharkey
e56724ba46 am 67f0739c: Merge "Block moving when already in progress." into mnc-dev 
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
  Block moving when already in progress.
 2015-08-07 23:46:42 +00:00
Jeff Sharkey
67f0739ca3 Merge "Block moving when already in progress." into mnc-dev 2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff Block moving when already in progress. 
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.

Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
 2015-08-07 15:59:28 -07:00
Billy Lau
2cbb3c868d am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:22:11 +00:00
Billy Lau
a59f39fca6 Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:15:32 +00:00
Dianne Hackborn
e426005beb am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-07 22:06:25 +00:00
Dianne Hackborn
e7a5966aa7 Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-07 21:58:52 +00:00
Dianne Hackborn
f5497aa93c Fix issue #23037720: New Battery Optimization Strings 
Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
 2015-08-07 14:43:55 -07:00
Dianne Hackborn
a1e572c528 Fix issue #23037720: New Battery Optimization Strings 
There be strings.

Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
 2015-08-07 14:38:58 -07:00
Pavel Zhamaitsiak
2fe4b3cb9e Ensure that listener is removed only if it was added 
Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
 2015-08-07 12:02:38 -07:00
Maurice Lam
d62aabf10d [Fingerprint] Use different ring size for setup 
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.

Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
 2015-08-07 10:48:48 -07:00
Julia Reynolds
a9490b6860 am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
  Hide optimization control on battery details page for non whitelisted apps.
 2015-08-07 16:35:56 +00:00
Julia Reynolds
5ab0e183ab Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 2015-08-07 16:29:41 +00:00
Geoff Mendal
acf198a7ac am 2d546b77: (-s ours) Import translations. DO NOT MERGE 
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE
 2015-08-07 04:44:33 +00:00
Geoff Mendal
2d546b77b9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
 2015-08-07 04:21:22 +00:00
Andres Morales
af2ea2f4dd am 4897fa87: Merge "fix CC for work profiles" into mnc-dev 
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
 2015-08-06 22:30:57 +00:00
Andres Morales
4897fa87a5 Merge "fix CC for work profiles" into mnc-dev 2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124 Wrap text on long preferences. 
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
 2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5 Hide optimization control on battery details page for non whitelisted apps. 
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
 2015-08-06 11:42:40 -04:00
Geoff Mendal
9acc740ed2 am 7930f872: (-s ours) Import translations. DO NOT MERGE 
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE
 2015-08-06 04:20:06 +00:00