Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,254 Commits 1 Branch 0 Tags
0642a2531fab1a1bae4e7c0dcb2b618501cef688
Commit Graph

8707 Commits

Author SHA1 Message Date
Makoto Onuki
0642a2531f am e0115ee5: am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev 
* commit 'e0115ee5725541dfb6cbc42de70adfd1767edde5':
  Add simple null checks to StorageWizard*, also listen to...
 2015-06-13 00:35:14 +00:00
Makoto Onuki
e0115ee572 am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev 
* commit '75651de4d17200d4aa0ae083303f8214c7b7478b':
  Add simple null checks to StorageWizard*, also listen to...
 2015-06-13 00:23:15 +00:00
Makoto Onuki
97d102d9e2 Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev 2015-06-12 23:57:54 +00:00
Makoto Onuki
1d37d0f7fb Add simple null checks to StorageWizard*, also listen to... 
the disk destroyed event.

Bug 21336042

Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
 2015-06-12 16:28:18 -07:00
Selim Cinek
e0c9e0f4ce am 827c5419: am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 
* commit '827c5419fa8e68bd0d7807e1799344e7760f1363':
  Added an introduction to the fingerprint enrollment
 2015-06-12 22:29:20 +00:00
Selim Cinek
827c5419fa am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 
* commit '0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
  Added an introduction to the fingerprint enrollment
 2015-06-12 22:22:27 +00:00
Selim Cinek
ee5db351ac Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 2015-06-12 21:57:45 +00:00
Makoto Onuki
4f33dc0416 am 0b5b05e2: am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev 
* commit '0b5b05e2f5883868aea2d8bb36ef1c95d643722d':
  Promote "add service" from menu to list item
 2015-06-12 16:55:19 +00:00
Rubin Xu
8b336e74b7 am 7d4f7abc: am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev 
* commit '7d4f7abc280f44e57d57b21b793bc4657f99bfa8':
  Defensively load untrusted icons from account authenticator
 2015-06-12 16:55:18 +00:00
Makoto Onuki
0b5b05e2f5 am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev 
* commit '20468a1160eef269b7116535128daeedfbb7811a':
  Promote "add service" from menu to list item
 2015-06-12 16:40:31 +00:00
Rubin Xu
7d4f7abc28 am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev 
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
  Defensively load untrusted icons from account authenticator
 2015-06-12 16:40:29 +00:00
Makoto Onuki
e0142a67fd Merge "Promote "add service" from menu to list item" into mnc-dev 2015-06-12 16:18:31 +00:00
Rubin Xu
47d329f79a Merge "Defensively load untrusted icons from account authenticator" into mnc-dev 2015-06-12 16:18:16 +00:00
Selim Cinek
ec8500438c Added an introduction to the fingerprint enrollment 
Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
 2015-06-11 19:02:26 -07:00
Adrian Roos
66fe739aa4 am b52435a9: am 593c1845: am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev 
* commit 'b52435a96309c40e73560a8fa8a15a4064f836be':
  Ensure text is visible when choosing pattern
 2015-06-12 01:10:02 +00:00
Adrian Roos
b52435a963 am 593c1845: am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev 
* commit '593c184584944aed230889a0e736ac484c435683':
  Ensure text is visible when choosing pattern
 2015-06-12 00:52:07 +00:00
Adrian Roos
da6e4c47aa Merge "Ensure text is visible when choosing pattern" into mnc-dev 2015-06-12 00:26:07 +00:00
Jorim Jaggi
79b49eb347 am e750927c: am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev 
* commit 'e750927c70a45b163b612d21ecdb546d46324fed':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
 2015-06-11 23:14:46 +00:00
Adrian Roos
ed427af748 Ensure text is visible when choosing pattern 
Bug: 21639578
Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
 2015-06-11 16:14:40 -07:00
Jorim Jaggi
e750927c70 am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev 
* commit '258e709a32ce69c906bea9e13e999d52e8ff5b32':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
 2015-06-11 23:05:50 +00:00
Jorim Jaggi
fb535a8e49 Merge "Refine fingerprint enrollment experience" into mnc-dev 2015-06-11 22:34:53 +00:00
Jeff Sharkey
cb830993df am a48e4fd9: am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev 
* commit 'a48e4fd9ed1c5be5f58d572a015fda6b0fc34d26':
  Always round migration times up to 1 second.
 2015-06-11 22:28:45 +00:00
Jeff Sharkey
a48e4fd9ed am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev 
* commit '41b7468feb96ac51f494abc5414f7f02e801ed97':
  Always round migration times up to 1 second.
 2015-06-11 22:17:19 +00:00
Jorim Jaggi
436e02c3d5 Refine fingerprint enrollment experience 
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working

Bug: 21617091
Bug: 21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
 2015-06-11 15:13:56 -07:00
Jason Monk
bdef599b1d am 1c4dcb03: am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev 
* commit '1c4dcb0315f8a6b5031327af668a6284304d6e88':
  Clean up settings shortcuts
 2015-06-11 21:34:04 +00:00
Makoto Onuki
0ec96fe64c Promote "add service" from menu to list item 
Also show the app icon for each service.

Bug 19914125

Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
 2015-06-11 14:26:29 -07:00
Jason Monk
1c4dcb0315 am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev 
* commit '02424dead1be6877d11bf30ba87e2b97dc9042d1':
  Clean up settings shortcuts
 2015-06-11 21:11:02 +00:00
Jeff Sharkey
f25fc9cb67 Merge "Always round migration times up to 1 second." into mnc-dev 2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a Always round migration times up to 1 second. 
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
 2015-06-11 13:43:56 -07:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2 Clean up settings shortcuts 
- Remove some bad entries
 - Fix icons to be top-level item specific
 - Add memory

Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
 2015-06-11 15:47:29 -04:00
John Spurlock
e90d20fbba am 6b2adf6e: am eed22852: am fca81cd2: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev 
* commit '6b2adf6e4e121248b45f6897f97d416bb9f80fc4':
  Settings: Follow frameworks change to volume sliders.
 2015-06-11 17:08:45 +00:00
John Spurlock
6b2adf6e4e am eed22852: am fca81cd2: Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev 
* commit 'eed2285257b9ae6b09d3dc36425578634f9fed27':
  Settings: Follow frameworks change to volume sliders.
 2015-06-11 14:30:42 +00:00
John Spurlock
fca81cd233 Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev 2015-06-11 14:08:46 +00:00
John Spurlock
f82154de8c Settings: Follow frameworks change to volume sliders. 
Bug: 21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
 2015-06-11 10:06:30 -04:00
Sanket Padawe
9761a97ff4 am baf0db3d: am 00c5226d: am 1d220f62: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 
* commit 'baf0db3d2b7539378505bac359aef975443c3f92':
  Fix SimPreference dialog from closing on orientation change.
 2015-06-11 05:56:20 +00:00
Jeff Sharkey
08057f035d am bfd717b1: am 3b47da58: am 680329f1: Follow string refactoring. 
* commit 'bfd717b150301ef57e5fc10ff6eb2e954256f9d0':
  Follow string refactoring.
 2015-06-11 05:56:18 +00:00
Lajos Molnar
8f45270634 am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 05:56:12 +00:00
Lucky Zhang
34eaaa01fa am 234c4c6c: am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev 
* commit '234c4c6c7c7e4a5b82c3f88d4343da10912eab98':
  [Settings] Pass lock type extra back to SUW
 2015-06-11 05:56:10 +00:00
Sanket Padawe
baf0db3d2b am 00c5226d: am 1d220f62: Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 
* commit '00c5226d6f7aad21e85c06808961eb97e01e982d':
  Fix SimPreference dialog from closing on orientation change.
 2015-06-11 02:54:24 +00:00
Jeff Sharkey
bfd717b150 am 3b47da58: am 680329f1: Follow string refactoring. 
* commit '3b47da581b2c05f00a2d9f5d3cd0f10fb786c7e6':
  Follow string refactoring.
 2015-06-11 02:53:17 +00:00
Lajos Molnar
204f4068f7 am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 02:53:15 +00:00
Jorim Jaggi
6dd8e039da am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit 'a66b907b1610ad67fd8c9b5746fa579bf886825c':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 02:53:13 +00:00
Lucky Zhang
234c4c6c7c am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev 
* commit 'ab21c7fa458e8aeabeef22096e304fd0c9a484da':
  [Settings] Pass lock type extra back to SUW
 2015-06-11 02:53:12 +00:00
Sanket Padawe
1d220f6242 Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 2015-06-11 01:41:21 +00:00
Nick Kralevich
d01f0d91ef am 54d37cdd: am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '54d37cddc6a8986e5966fc6058e0f1dcd6d808cd':
  Fix USB access control when adb is disabled.
 2015-06-11 01:34:11 +00:00
Jason Monk
938ffbf0dc am 3b145d90: am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev 
* commit '3b145d9086fb46a0d20c2724dac6ae8ef1e24400':
  Hide tap to wake on devices that don't support it
 2015-06-11 01:34:10 +00:00
Jason Monk
f14f4509f9 am 24da8529: am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev 
* commit '24da85296897a4130961491978e7b339e5f77a37':
  App storage settings - Request size onResume
 2015-06-11 01:34:09 +00:00
Jason Monk
25326207d3 am 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit '68ce17ff25b497edb7e0ec20a672475b76e604c8':
  New dialog for ignore battery optimizations
 2015-06-11 01:34:07 +00:00