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

23147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
95a3e2200c am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '7c8cb46fe383956830a04e079a13ded56f7c2154':
  Make "Ask every time" actually work that way
 2015-08-14 17:35:13 +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
Julia Reynolds
ab60fe2a14 Use a button style that visibly shows when the button is disabled. 
Bug: 21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
 2015-08-14 09:55:37 -04: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
ffe642ed03 am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit 'fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1':
  Show storage slow dialog allowing state loss.
 2015-08-14 01:37:59 +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
Todd Kennedy
9b47830a2d Merge "Fix string for translation" 2015-08-13 19:57:37 +00:00
Todd Kennedy
344c1b8a47 Fix string for translation 
Increase character limit and help provide some additional context for
the strings

Bug: 23175115
Bug: 23173307
Bug: 23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
 2015-08-13 12:56:48 -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
Geoff Mendal
6b60287ff9 am 06d14c52: (-s ours) am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit '06d14c5243af84dfb2ba1a9027c9215b6d751d1e':
  Import translations. DO NOT MERGE
 2015-08-13 06:55:08 +00:00
Geoff Mendal
06d14c5243 am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit 'b38520448f52683130a01728eab67018929775b2':
  Import translations. DO NOT MERGE
 2015-08-13 06:43:03 +00:00
Geoff Mendal
b38520448f am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit '93d1612d160f3e71c6dead490a36a334f6abb25f':
  Import translations. DO NOT MERGE
 2015-08-13 05:09:45 +00:00
Geoff Mendal
93d1612d16 am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit '8a12d17b09281f09adaf6685680f7cb991aef049':
  Import translations. DO NOT MERGE
 2015-08-13 05:04:41 +00:00
Geoff Mendal
8a12d17b09 am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
  Import translations. DO NOT MERGE
 2015-08-13 04:59:17 +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
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
0cae8ad781 am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 
* commit 'e9639b1d0141ce25548105a17eab3e30b6341f1a':
  Wait with finishing until fingerprints are removed
 2015-08-13 01:35:51 +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
cd2b9e1217 am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '2be290cf36f06da260e67b430a625422da512609':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:09:10 +00: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
8d425a526b am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev 
* commit 'd0513282f81d8218eb0fef93a7316a6699d087f7':
  Avoid sending identity along with EAP sim, aka & aka'.
 2015-08-12 17:50:54 +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
Geoff Mendal
306258dad2 am 0c49d5b9: (-s ours) am ce821387: (-s ours) am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE 
* commit '0c49d5b9d08ad352af78d1e943623585f49a7f3f':
  Import translations. DO NOT MERGE
 2015-08-12 14:24:56 +00:00
Geoff Mendal
0c49d5b9d0 am ce821387: (-s ours) am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE 
* commit 'ce821387ba6b6745a99c2a3231a5c0b2e42a34fc':
  Import translations. DO NOT MERGE
 2015-08-12 14:18:59 +00:00
Geoff Mendal
ce821387ba am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE 
* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
  Import translations. DO NOT MERGE
 2015-08-12 14:11:11 +00:00