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#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#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#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#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#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#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
Amit Mahajan
21742874f7
Validate the uri received in ApnEditor.
...
Uri should only refer to telephony carriers and no other provider.
Bug: 11184401
Change-Id: I38c25a37a48883f971c4f405a98db5066a707909
2015-10-28 20:45:25 +00:00
Maurice Lam
a36ac2a772
Merge "[WifiDialog] "Add network" return WifiConfig"
2015-10-28 17:32:03 +00:00
Julia Reynolds
0768ef68ca
Temporarily reenable 3P condition providers.
...
This code will go away once there is a better way for a user to
approve 3P CPs.
Change-Id: I56a72d03a75c2c60f6f19f82f091d9a1c7f3f715
2015-10-28 09:55:04 -04:00
Philip P. Moltmann
1f2ea06fc6
Merge "Deal with daylight savings time in battery chart."
2015-10-27 19:56:48 +00:00
Philip P. Moltmann
99b78b3eeb
Deal with daylight savings time in battery chart.
...
Without daylight saving time the middle between two beginnings of days
can only be another beginning of a day or noon. Due to daylight savings
time this can be shifted by up to one hour in either direction.
This change corrects the middle value.
Testing Done: Tried the calculation of the three values with Lisbon time
and
mStartWallTime = 1414254027000L;
mEndWallTime = 1414473627000L;
which spans over 10/26/2014, the day daylight saving ended in Lisbon.
Change-Id: I2d2ba6e1fd2e409ca3f6b0f7674ec250da7ffad5
2015-10-27 12:19:46 -07:00
Julia Reynolds
e8244399bc
Merge changes I3508c15a,I7b735ec0
...
* changes:
Always show rule creation option.
Remove some dead zen mode code.
2015-10-27 19:07:09 +00:00
Jorim Jaggi
b12e9adc97
Add development option to force everything resizable
...
Bug: 24815256
Change-Id: Ic9620c3b502e92f1a628bbe696ae91896d25d5b3
2015-10-27 08:31:49 -07:00
Julia Reynolds
35f8f6bcf3
Always show rule creation option.
...
Change-Id: I3508c15a0e9b727d7bc3dd63bd6482a623aaef5b
2015-10-27 15:29:24 +00:00
Julia Reynolds
fd64665746
Remove some dead zen mode code.
...
Change-Id: I7b735ec0efff2a3758376d59e93df0e0e1530653
2015-10-27 08:43:38 -04:00
Makoto Onuki
c1a86f1de0
Merge "Do not use UM.setUserRestrictions() in Settings"
2015-10-26 21:37:08 +00:00
Makoto Onuki
b761ad1c6e
Do not use UM.setUserRestrictions() in Settings
...
Change-Id: I014fe939f3495521a813eadbb7353956afc3feb4
2015-10-26 14:35:44 -07:00
Tony Mantler
dd9b3aa5de
Merge "Move some app methods to AppUtils in SettingsLib"
2015-10-26 18:39:14 +00:00
Tony Mantler
4f4424a820
Move some app methods to AppUtils in SettingsLib
...
Change-Id: I1503e9d0e35c57aae32f90ff2c148cf1b75dcf05
2015-10-26 10:49:19 -07:00
Alan Viverette
61eaed7bfb
Merge "Let the framework handle long clicks"
2015-10-26 14:01:18 +00:00
Alan Viverette
8fa75e03f7
Let the framework handle long clicks
...
If we manually propagate long click events, the framework can't include
coordinate information and we'll only be able to show a modal dialog.
Since the default long-click behavior is to show the context menu, just
let the framework handle it.
Bug: 25214386
Change-Id: I32e14b326ac91cc5a9c2bf7581325daaba34298e
2015-10-23 10:49:23 -04:00
Clara Bayarri
93bcfcb14d
Disable passphrase change flow encryption screen when not main user
...
When the user changing passphrase is not the process' user, disable
the "Ask for password on device startup" screen, as it makes no sense.
Change-Id: I521b5ec8702f7a39b94012a606794e04135e4c75
2015-10-23 13:32:42 +01:00
Clara Bayarri
386919bef8
Merge "Refactor Choose/Confirm Lock flow to take user id"
2015-10-23 10:13:37 +00:00
Maurice Lam
30b3287eb5
[WifiDialog] "Add network" return WifiConfig
...
When adding a network by manually entering SSID, return the wifi
configuration to the caller.
Change-Id: If490a341fe95b9c63f43d3bb30a2114bfcd45082
2015-10-22 16:57:50 -07:00
Jason Monk
bcd1a8f73c
Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d am: eccc9b3962
...
am: 652ba5e22e
2015-10-22 23:48:54 +00:00
Jason Monk
652ba5e22e
Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d
...
am: eccc9b3962
2015-10-22 23:42:14 +00:00
Jason Monk
34d6ea560d
Fix crash in Settings from uninstall
...
am: 6e2e8e17cf
2015-10-22 23:12:02 +00:00
Jason Monk
6e2e8e17cf
Fix crash in Settings from uninstall
...
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
2015-10-22 22:58:50 +00:00
Maurice Lam
2fa828a951
Merge "[WifiDialog] Allow adding unspecified AP"
2015-10-22 19:52:05 +00:00
Maurice Lam
34e5a0c308
[WifiDialog] Allow adding unspecified AP
...
In WifiDialogActivity, handle the case where the given
accessPointState is null, and show the Wi-Fi dialog allowing users
to enter the SSID and other credentials. This will be used by setup
wizard when user selected "Add new network" item.
Bug: 23392285
Change-Id: Ica2650d9e829d73281bc9c504c3005d9c5750d31
2015-10-22 11:39:26 -07:00
Xiaohui Chen
bf10314819
Merge "Clean up UserHandle.isOwner() in settings"
2015-10-21 21:49:49 +00:00
Xiaohui Chen
f9ee84dba4
Clean up UserHandle.isOwner() in settings
...
Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
2015-10-21 11:26:14 -07:00
Jason Monk
f0c26ab7d5
Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148 am: 47db2ba628
...
am: 4f9f28effb
2015-10-21 02:29:23 +00:00
Jason Monk
4f9f28effb
Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148
...
am: 47db2ba628
2015-10-21 02:20:21 +00:00
Jason Monk
6fde534148
Allow access to permissions, even if app has none
...
am: 36866c8e84
2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84
Allow access to permissions, even if app has none
...
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
2015-10-20 19:38:58 -04:00
Jeff Sharkey
2f43b146f5
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
...
am: ead9448b4a
2015-10-20 23:14:42 +00:00
Jeff Sharkey
5368e7519d
Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073 am: 0b07ce50a7
...
am: 6a4bd6f6f9
2015-10-20 23:14:32 +00:00
Jeff Sharkey
2fa5c2645e
resolve merge conflicts of 071352de9e to master.
...
Change-Id: Ib777927fd479fcb567d005910930fda7354865d0
2015-10-20 16:04:59 -07:00
Jason Monk
30e0a4a48a
resolve merge conflicts of 8e18934478 to master.
...
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
2015-10-20 14:29:43 -07:00
