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
44643bad26
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d
...
am: a42bad972c
* commit 'a42bad972ca44f52ac84b3139198acc11dec0d4f':
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:24:34 +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
Maurice Lam
c8383ad5c7
Merge "[WifiDialog] Guard with CHANGE_WIFI permission"
2015-10-30 17:17:57 +00:00
Dianne Hackborn
3b4e4dd91d
Merge "Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-30 17:16:20 +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
2af9128966
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076
...
am: 68954d930d
* commit '68954d930d0a583c7150e1a3959d5a798b8e5f34':
Fix issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:43:04 +00:00
Maurice Lam
ec1f2eeaf1
[WifiDialog] Guard with CHANGE_WIFI permission
...
Guard WifiDialogActivity with CHANGE_WIFI_STATE permission.
Bug: 25189534
Change-Id: I97e311f35873323c7db6a2e47f4155da6d73e9f6
2015-10-29 16:40:49 -07: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
508559d076
Merge "Fix issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-29 23:36:14 +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
bf933b9684
Merge "Temporarily reenable 3P condition providers."
2015-10-28 14:34:41 +00:00
Geoff Mendal
a9e08d4604
Import translations. DO NOT MERGE am: 260d90a102
-s ours am: 04817defc9
-s ours am: fe5582a26b
-s ours
...
am: b5497564ee
-s ours
* commit 'b5497564eecfa8af6d86daa174faba523859fd55':
Import translations. DO NOT MERGE
2015-10-28 14:13:26 +00:00
Geoff Mendal
b5497564ee
Import translations. DO NOT MERGE am: 260d90a102
-s ours am: 04817defc9
-s ours
...
am: fe5582a26b
-s ours
* commit 'fe5582a26b461482c51a163b76c2283ae96116eb':
Import translations. DO NOT MERGE
2015-10-28 14:10:08 +00:00
Geoff Mendal
fe5582a26b
Import translations. DO NOT MERGE am: 260d90a102
-s ours
...
am: 04817defc9
-s ours
* commit '04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
2015-10-28 14:05:28 +00:00
Geoff Mendal
04817defc9
Import translations. DO NOT MERGE
...
am: 260d90a102
-s ours
* commit '260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
2015-10-28 14:00:31 +00:00
Geoff Mendal
260d90a102
Import translations. DO NOT MERGE
...
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
2015-10-28 08:55:41 -05: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
Geoff Mendal
c66b4e819d
Import translations. DO NOT MERGE
...
Change-Id: Idbdba1c5697e8058cbe7ec5aa7b77f567ca73623
Auto-generated-cl: translation import
2015-10-28 08:14:45 -05: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
Geoff Mendal
a688553632
Import translations. DO NOT MERGE am: c338bacb59
-s ours am: 884a8bbe78
-s ours am: 436fcc47fc
-s ours
...
am: 80f2b5430e
-s ours
* commit '80f2b5430e3a448d9c818e33ceff9cd674ecbbda':
Import translations. DO NOT MERGE
2015-10-27 04:51:06 +00: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
Geoff Mendal
80f2b5430e
Import translations. DO NOT MERGE am: c338bacb59
-s ours am: 884a8bbe78
-s ours
...
am: 436fcc47fc
-s ours
* commit '436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
Import translations. DO NOT MERGE
2015-10-26 14:22:41 +00:00
Geoff Mendal
436fcc47fc
Import translations. DO NOT MERGE am: c338bacb59
-s ours
...
am: 884a8bbe78
-s ours
* commit '884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
2015-10-26 14:17:02 +00:00
Geoff Mendal
884a8bbe78
Import translations. DO NOT MERGE
...
am: c338bacb59
-s ours
* commit 'c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
2015-10-26 14:13:23 +00:00
Geoff Mendal
c338bacb59
Import translations. DO NOT MERGE
...
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
2015-10-26 07:03:05 -07:00