Jason Monk
bc0fd853c3
Merge "Context isn't good enough, actually check for null"
2015-11-10 20:10:26 +00:00
Jason Monk
e764165369
Context isn't good enough, actually check for null
...
Bug: 25606212
Change-Id: Ic765d5a37fa19ecd22bb47694514e6ee0bdb84a5
2015-11-10 15:09:34 -05:00
Jason Monk
bcefeb699d
Merge "Use context instead of activity"
2015-11-10 19:55:49 +00:00
Jason Monk
886978f411
Use context instead of activity
...
Bug: 25606212
Change-Id: I5d7eca547562ab968c5f7a4b91119ee7b1c3bce5
2015-11-10 14:54:18 -05:00
Tony Mantler
25fd4eaf1e
Merge "Move RecentLocationApps to SettingsLib"
2015-11-10 17:48:46 +00:00
Felipe Leme
27fb6c21ee
Merge "Set key when Explore preference is created, otherwise tapping it will cause a NPE. BUG: 25597961"
2015-11-10 00:28:40 +00:00
Felipe Leme
dc4dbbdb49
Set key when Explore preference is created, otherwise tapping it will cause a NPE.
...
BUG: 25597961
Change-Id: I1e2fc8caa961e1054472b46cbeb6aad407a1f91a
2015-11-09 15:52:32 -08:00
Jason Monk
7d6aa790fd
Null check queryIntentServices am: a4c9492b50
am: e27cada8c4
am: e198f7b84f
...
am: 7ee05202ab
* commit '7ee05202abcf7be3b3ee9cf1bf894047b407ce2d':
Null check queryIntentServices
2015-11-09 22:45:02 +00:00
Jason Monk
7ee05202ab
Null check queryIntentServices am: a4c9492b50
am: e27cada8c4
...
am: e198f7b84f
* commit 'e198f7b84fde2b3ca3f0e0c9195166b06363850e':
Null check queryIntentServices
2015-11-09 22:40:33 +00:00
Jason Monk
e27cada8c4
Null check queryIntentServices
...
am: a4c9492b50
* commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50
Null check queryIntentServices
...
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Philip P. Moltmann
68d6e32b65
Merge "Remove warning message when enabling a serive and enable new services"
2015-11-09 18:38:22 +00:00
Tony Mantler
f313a75e26
Move RecentLocationApps to SettingsLib
...
Change-Id: I696126299e31da3d031778e58e43d298336ccb5f
2015-11-09 10:27:44 -08:00
Philip P. Moltmann
849c05f342
Remove warning message when enabling a serive and enable new services
...
The warning message will be moved to the print spooler and displayed
when the user issues the first print job to the service.
Change-Id: I121ad0b46e5b3e25e68db4cc67a59fbaf15c70c3
Bug: 24135353
2015-11-06 17:13:06 -08:00
Jim Miller
076b0e885e
Merge "Auto advance fingerprint enrollment when user taps on the sensor"
2015-11-06 23:22:25 +00:00
Maurice Lam
5444d955a6
Merge "[WifiDialog] Theme for setup wizard"
2015-11-06 20:52:33 +00:00
Maurice Lam
dd3e2434ee
[WifiDialog] Theme for setup wizard
...
Use setup wizard themes so that dialogs are shown in the correct
accent colors and dark/light themes.
Bug: 25515641
Change-Id: I87a0a01001944b50e48ec812f071a988f37ed8db
2015-11-06 12:07:32 -08:00
Paul Lawrence
ee3e51f1f1
Merge "Add developer option to convert from FDE to FBE"
2015-11-05 21:41:02 +00:00
Felipe Leme
157ec2f09a
Change workflow so update() is not called when the device changes orientation.
...
BUG: 24508289
Change-Id: I7929aac953741a19f5bc4ffbbb9929a9a2f6104e
2015-11-04 14:27:04 -08:00
Jason Monk
0cc7fbdb56
Merge "Settings Drawer: Support multi-user changes"
2015-11-04 21:10:20 +00:00
Jason Monk
c99f909b5a
Merge "First pass at drawer to Settings"
2015-11-04 20:19:18 +00:00
Jason Monk
af00109242
Settings Drawer: Support multi-user changes
...
Change-Id: I3a6e481ca18794bf1ed3bc9dc0382deacfcf81f4
2015-11-04 13:16:18 -05:00
Paul Lawrence
acbac8cdfe
Add developer option to convert from FDE to FBE
...
This set of changes adds the screen that offers this conversion,
and the plumbing so the option is only available on suitable
devices.
It does not implement the conversion mechanism.
Change-Id: I3c84dd40dfcb0e00dadbab54ba0e56e1ccb11ed8
2015-11-04 09:51:06 -08:00
Julia Reynolds
641b15b706
Merge "Null check in onPostExecute."
2015-11-04 17:06:16 +00:00
Jason Monk
4da79e088f
First pass at drawer to Settings
...
Change-Id: I94c3bc69ff773e48c33f59f37bfc0d91139c187a
2015-11-04 11:11:25 -05:00
Jason Monk
e779213d8e
Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7
am: 92aafd3ed5
...
am: 1150cfce95
* commit '1150cfce95950f9de3e6e340b6d8efaf5bbd3eb0':
Don't show MIDI USB option if not supported
2015-11-04 15:12:06 +00:00
Julia Reynolds
bebd2a482e
Null check in onPostExecute.
...
Change-Id: I8bc8c0b062583b4b9c54152c516f160df4f645e7
2015-11-04 10:11:41 -05:00
Jason Monk
1150cfce95
Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7
...
am: 92aafd3ed5
* commit '92aafd3ed5391eb5b172c54e6ea820dd36110c99':
Don't show MIDI USB option if not supported
2015-11-04 15:02:47 +00:00
Jason Monk
92aafd3ed5
Merge "Don\'t show MIDI USB option if not supported"
...
am: c2a9cd03f7
* commit 'c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
Don't show MIDI USB option if not supported
2015-11-04 14:56:04 +00:00
Zoran Jovanovic
81ec094554
Don't show MIDI USB option if not supported
...
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)
Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
2015-11-04 15:21:58 +01:00
Jim Miller
b3253f1d75
Auto advance fingerprint enrollment when user taps on the sensor
...
Fixes bug 25244236
Change-Id: Ifba52a67f6cfcd3b3d17530300b0f5f0299cd688
2015-11-04 03:20:39 +00:00
Felipe Leme
77c69c5a22
Merge "Minor changes on bug report settings on 'Developer options'."
2015-11-03 22:30:22 +00:00
Felipe Leme
27df7a36fc
Minor changes on bug report settings on 'Developer options'.
...
1.Allows bug report options on all builds.
2.Associates bug report storage provider status to 'Bug report shortcut'
option.
3.Replaces deprecated constants.
BUG: 7436261
BUG: 24667178
Change-Id: I249ef6c168e2a8bc947efd6ac398a7a369089140
2015-11-03 14:22:51 -08:00
Alan Viverette
74dbcb091b
Add display preference for scaling / UI Zoom feature
...
Bug: 22450672
Change-Id: If665576869743fd7d5fc23103260eecaa366e7aa
2015-11-03 13:18:44 -05:00
Tony Mantler
514b81d233
Move more Accessibility stuff to SettingsLib
...
Change-Id: Id5dec8af86c1d4b0d98b169c4365410c2cee10b6
2015-10-30 16:20:25 -07:00
Jeff Sharkey
31691bffd7
Refresh storage UI when disk is destroyed.
...
Otherwise we leave stale items for the user to click on.
Bug: 25370499
Change-Id: Ia4492b7fb5a1a722bb92a583344677071ef07bba
2015-10-30 18:26:32 +00:00
Dianne Hackborn
d4dee3b70d
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d
am: a42bad972c
am: 44643bad26
...
am: c271a8a00e
* commit 'c271a8a00e2686c371420406a12fd41c4a97e24d':
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:31:09 +00:00
Dianne Hackborn
c271a8a00e
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d
am: a42bad972c
...
am: 44643bad26
* commit '44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:27:44 +00:00
Dianne Hackborn
a42bad972c
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 3b4e4dd91d
* commit '3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:20:13 +00:00
Jason Monk
3472f75974
Merge "Fix accounts screen"
2015-10-30 16:51:09 +00:00
Jason Monk
4b2e456e90
Fix accounts screen
...
Bug: 25212341
Change-Id: Ia8953b6a9fbbd4c90cd0eb327081c478420f7db6
2015-10-30 12:50:31 -04:00
Julia Reynolds
75b4911c5e
Merge "Permission changes for DND Add Rule page."
2015-10-30 16:01:00 +00:00
Tony Mantler
2be3393e5a
Merge "Move AccessibilityUtils to SettingsLib"
2015-10-30 15:59:11 +00:00
Julia Reynolds
2714f2ba07
Permission changes for DND Add Rule page.
...
Don't whitelist CPs when visiting the Add Rule Page; update
the permission CPs are tracked by; don't show CPs in the add
rule dialog if the user hasn't whitelisted them.
Bug: 22977552
Change-Id: I8b363d7106de088e68b9659e3f0098848c6d3153
2015-10-30 11:32:05 -04:00
Dianne Hackborn
b6c7b05056
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
...
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
2015-10-29 17:32:28 -07:00
Dianne Hackborn
f8f52df702
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076
am: 68954d930d
am: 2af9128966
...
am: 6ee79b2823
* commit '6ee79b282346b976df98b2af214af4800fc68c26':
Fix issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:51:11 +00:00
Dianne Hackborn
6ee79b2823
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076
am: 68954d930d
...
am: 2af9128966
* commit '2af9128966ee855d6c8e06479562cb141c625511':
Fix issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:46:20 +00:00
Dianne Hackborn
68954d930d
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 508559d076
* commit '508559d0760596509f07fa56371c6e18d8bd9559':
Fix issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:39:39 +00:00
Dianne Hackborn
30bbd902dd
Fix issue #25371736 : Don't include z-ram allocations in Android OS
...
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
2015-10-29 15:43:21 -07:00
Tony Mantler
351321c2b5
Move AccessibilityUtils to SettingsLib
...
Change-Id: I1ad6b89e6dce1f7cad337b49774694f16479342b
2015-10-29 13:16:31 -07:00