PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,638 Commits 1 Branch 0 Tags
c31bfb2dca0c95de1012566ac586ab1f18c7ccd7
Commit Graph

9701 Commits

Author SHA1 Message Date
Jeff Sharkey
b4158f0e15 Merge "Only offer migration between private volumes." into mnc-dev 2015-08-14 18:23:39 +00:00
Chris Tate
b184056727 am 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '95a3e2200c8e2662999bf2453ca8312d6c5312c0':
  Make "Ask every time" actually work that way
 2015-08-14 17:41:11 +00:00
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
6f52ed3332 Only offer migration between private volumes. 
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.

Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
 2015-08-14 09:46:03 -07:00
Adam Lesinski
8f743471d5 BatteryStats: Fix coalescing of shared app GIDs and system UIDs 
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.

Bug:23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
 2015-08-13 22:12:47 -07:00
Jeff Sharkey
5f2194855f am 6dcc2004: am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit '6dcc2004ad49c7b2cbdb5fc87a9b83d1be1cccaf':
  Show storage slow dialog allowing state loss.
 2015-08-14 03:27:38 +00:00
Jeff Sharkey
6dcc2004ad am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'ffe642ed030277d2e065b6ad55596c35b1daff39':
  Show storage slow dialog allowing state loss.
 2015-08-14 03:18:55 +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
Julia Reynolds
fcfe3d82d2 Merge "Switch font size from a dialog to dropdown preference." 2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d Switch font size from a dialog to dropdown preference. 
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
 2015-08-13 10:40:29 -04:00
Jorim Jaggi
c03459cd05 am 90ca1b67: am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 
* commit '90ca1b67cfa1507126c6b74b2de059d3bf579734':
  Wait with finishing until fingerprints are removed
 2015-08-13 03:18:43 +00:00
Dianne Hackborn
ca9433519b am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:09 +00:00
Jorim Jaggi
90ca1b67cf am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 
* commit '0cae8ad78170d56beaafcb18015e25421895ac50':
  Wait with finishing until fingerprints are removed
 2015-08-13 01:42:13 +00: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
Dianne Hackborn
a0b5ab0ef6 am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:08 +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
Jason Monk
4b0e84d667 Merge "Make DropDownPreference extend ListPreference" 2015-08-12 18:23:13 +00:00
Jason Monk
94e460fd45 Fix Usb-C dialog issues 
- Fix theme
 - Fix PTP bug introduced in initial USB-C support

Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
 2015-08-12 14:14:33 -04:00
Sanket Padawe
28c78cc854 am f974b78d: am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev 
* commit 'f974b78d36f7bd449d3dbfc7c7c64e273cb16c78':
  Avoid sending identity along with EAP sim, aka & aka'.
 2015-08-12 18:09:32 +00:00
Sanket Padawe
f974b78d36 am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev 
* commit '8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
  Avoid sending identity along with EAP sim, aka & aka'.
 2015-08-12 18:03:56 +00: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
Jason Monk
49b6103b56 Make DropDownPreference extend ListPreference 
Lots of updates to handle static setting of entries/values
Callbacks are now through preference changes
Fix weird inconsistencies in callback return values...

Change-Id: I2ebe02c3492ce543162efcd55bdae3f2c4039287
 2015-08-12 13:01:38 -04:00
Todd Kennedy
c37a80990b Merge "Add force external setting" 2015-08-12 16:53:32 +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
270418980a am 9ee3a615: am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit '9ee3a615463faec08d4dfb9b045f9211c93d742e':
  [ConfirmPattern] use correct user id for stealth mode
 2015-08-12 00:00:22 +00:00
Andres Morales
9ee3a61546 am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit 'f1808dcafc45fea92e27b5300f4d6cc742bb3105':
  [ConfirmPattern] use correct user id for stealth mode
 2015-08-11 23:56:36 +00: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
Paul Lawrence
517b83beb6 am ce555844: am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev 
* commit 'ce55584478ee3f7e2a50c718efd79b834f326741':
  Gray out confirm button on pattern/pin/password set dialog
 2015-08-11 23:23:48 +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
ce55584478 am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev 
* commit 'a66240fd94cb458cb1e938419abad676b8132ca5':
  Gray out confirm button on pattern/pin/password set dialog
 2015-08-11 23:03:18 +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
fe7a25f8fe am 1e29e6b9: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
  Add setting to disable camera gesture
 2015-08-11 14:20:29 +00:00
Jason Monk
1e29e6b9ec am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '31227bfaf12ede192474bb162f1555215ffa605b':
  Add setting to disable camera gesture
 2015-08-11 14:12:00 +00: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