Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,165 Commits 1 Branch 0 Tags
7c8cb46fe383956830a04e079a13ded56f7c2154
Commit Graph

8946 Commits

Author SHA1 Message Date
Chris Tate
7c8cb46fe3 am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
  Make "Ask every time" actually work that way
 2015-08-14 17:27:02 +00:00
Chris Tate
36e2d32dab am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
  Make "Ask every time" actually work that way
 2015-08-14 17:20:18 +00:00
Chris Tate
7e36d33c00 Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:48 +00:00
Jeff Sharkey
fa62043590 am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'c73287b9dbfe63ddde24ac1e0975f50382f24e71':
  Show storage slow dialog allowing state loss.
 2015-08-14 01:31:27 +00:00
Jeff Sharkey
c73287b9db 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:41 +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
Christopher Tate
970291e20c Make "Ask every time" actually work that way 
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
 2015-08-13 16:34:10 -07:00
Jorim Jaggi
e9639b1d01 am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 
* commit '5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
  Wait with finishing until fingerprints are removed
 2015-08-13 01:28:21 +00:00
Jorim Jaggi
5dd0e27fbb Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 2015-08-13 01:18:03 +00:00
Jorim Jaggi
f92fbc1c49 Wait with finishing until fingerprints are removed 
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
 2015-08-12 18:12:58 -07:00
Dianne Hackborn
2be290cf36 am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:23 +00:00
Dianne Hackborn
6a1e1e08a0 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:54:31 +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
Sanket Padawe
d0513282f8 am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev 
* commit '1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
  Avoid sending identity along with EAP sim, aka & aka'.
 2015-08-12 17:34:42 +00:00
Sanket Padawe
1d29bde1f5 Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev 2015-08-12 17:17:31 +00:00
Sanket Padawe
f1165c14c5 Avoid sending identity along with EAP sim, aka & aka'. 
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
 2015-08-11 18:42:36 -07:00
Andres Morales
e5d646841d am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit 'a7bdde58856c7cf776cb326b7a1a9c58d649b3f8':
  [ConfirmPattern] use correct user id for stealth mode
 2015-08-11 23:43:51 +00:00
Andres Morales
a7bdde5885 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:59 +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
Paul Lawrence
550f66edfe am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev 
* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
  Gray out confirm button on pattern/pin/password set dialog
 2015-08-11 22:25:31 +00:00
Paul Lawrence
68f79718f7 Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev 2015-08-11 22:20:53 +00:00
Paul Lawrence
cff37ecbdd Gray out confirm button on pattern/pin/password set dialog 
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.

Note that this requires async tasks so that the button is shown as gray
in a timely way.

Also don't add another stage - this causes a11y to repeat the title.

Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
 2015-08-11 15:17:04 -07:00
Jason Monk
bce29c8a01 am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
  Add setting to disable camera gesture
 2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +00:00
Dianne Hackborn
01cfaadeeb am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:28:17 +00:00
Dianne Hackborn
e9bcef3541 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:19:40 +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
Julia Reynolds
f47896d223 am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
  Wrap text on long preferences.
 2015-08-10 20:45:56 +00:00
Julia Reynolds
77dc56bc4c am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev 
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
  Wrap text on long preferences.
 2015-08-10 20:37:34 +00:00
Julia Reynolds
2557d8a251 Merge "Wrap text on long preferences." into mnc-dev 2015-08-10 20:32:49 +00:00
Jason Monk
9614b50319 am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev 
* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
  Remove extra help & feedback menu from power usage
 2015-08-10 20:21:53 +00:00
Jason Monk
a1f64bf207 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:14:46 +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
05c4a75701 am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev 
* commit 'f48424e17caf6d4e890154d45c70a125802e1682':
  Ensure that listener is removed only if it was added
 2015-08-10 17:41:22 +00:00
Pavel Zhamaitsiak
f48424e17c 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:16 +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
11088b815b am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev 
* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
  Block moving when already in progress.
 2015-08-07 23:58:46 +00:00
Jeff Sharkey
cb0c07181a am 67f0739c: Merge "Block moving when already in progress." into mnc-dev 
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
  Block moving when already in progress.
 2015-08-07 23:51:57 +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
8c26cbd87e am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 
* commit '5b2c66e4da749ca59d09776ec7831e20d1211909':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
 2015-08-07 22:28:38 +00:00
Billy Lau
5b2c66e4da 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:19 +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
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
Julia Reynolds
e113f0c487 am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 
* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
  Hide optimization control on battery details page for non whitelisted apps.
 2015-08-07 16:45:04 +00:00
Julia Reynolds
b7028f254d 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:34:58 +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