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

21733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
b5ca40c644 am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit '11d1caede255fe9643692974031fb93448adbd97':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:55:05 +00:00
Adam Lesinski
11d1caede2 am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:47:43 +00:00
Adam Lesinski
e3ddd117a6 am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:43:40 +00:00
Adam Lesinski
3cc05c9d7e Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Jeff Sharkey
b38493cc6c am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
  Only offer migration between private volumes.
 2015-08-14 18:40:03 +00:00
Jeff Sharkey
b0f9e9d49f am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.
 2015-08-14 18:34:36 +00:00
Jeff Sharkey
82fee7bd0a am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
 2015-08-14 18:29:15 +00:00
Jeff Sharkey
b4158f0e15 Merge "Only offer migration between private volumes." into mnc-dev 2015-08-14 18:23:39 +00:00
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
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
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
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
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
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
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
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
Geoff Mendal
699ef29e9f am 42ae7fba: (-s ours) Import translations. DO NOT MERGE 
* commit '42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
  Import translations. DO NOT MERGE
 2015-08-12 14:06:27 +00:00
Geoff Mendal
42ae7fba5b Import translations. DO NOT MERGE 
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
 2015-08-12 07:00:45 -07: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
f1808dcafc am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit 'e5d646841d62484939c660e078c712866c64f244':
  [ConfirmPattern] use correct user id for stealth mode
 2015-08-11 23:48:50 +00:00
Dianne Hackborn
0f440a701c am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:48:49 +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
Dianne Hackborn
540afe774a am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:39:23 +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
9f879ef009 Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 2015-08-11 23:31:23 +00:00
Maurice Lam
d217463629 am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
  [Fingerprint] Use different ring size for setup
 2015-08-11 23:27:00 +00:00
Dianne Hackborn
e2e76435f4 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:45 +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