Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b
to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Jason Monk
769ba03b8f
am 0557f4c3
: am b46b9934
: am 6d8fdb82
: am 838c8432
: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00
Jason Monk
c2f431debe
am 97c68c18
: am 8e350e80
: am b48e56c9
: am 959a7380
: am 178c4099
: Merge "Handle monkey crash" into mnc-dev
...
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
Handle monkey crash
2015-07-21 00:14:01 +00:00
Jason Monk
97c68c181d
am 8e350e80
: am b48e56c9
: am 959a7380
: am 178c4099
: Merge "Handle monkey crash" into mnc-dev
...
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
Handle monkey crash
2015-07-20 21:38:07 +00:00
Jason Monk
178c40998d
Merge "Handle monkey crash" into mnc-dev
2015-07-20 20:32:29 +00:00
Christopher Tate
d2dcd30acd
am 99e89859
: am ef1961c7
: am 7cce6d0c
: am f330857a
: am b852fcbd
: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
Offer 'ask' as an available app-linking state
2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959
am ef1961c7
: am 7cce6d0c
: am f330857a
: am b852fcbd
: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
Offer 'ask' as an available app-linking state
2015-07-20 18:17:05 +00:00
Jason Monk
bd45c3cbe0
Handle monkey crash
...
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
2015-07-20 13:40:40 -04:00
Christopher Tate
b852fcbde9
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f
Offer 'ask' as an available app-linking state
...
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Julia Reynolds
7c5f0e18cc
am 406b1b9f
: am 98f81284
: am 03b1b4f3
: am 8560ae2f
: am 0c03b50a
: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '406b1b9f204e769181901a2c157b026971e902fb':
Remove blank switchtext from switch preferences.
2015-07-17 21:21:48 +00:00
Julia Reynolds
406b1b9f20
am 98f81284
: am 03b1b4f3
: am 8560ae2f
: am 0c03b50a
: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
Remove blank switchtext from switch preferences.
2015-07-17 21:07:35 +00:00
Jason Monk
b1d9536e58
Remove tuner from development settings
...
It has a new home now.
Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Jason Monk
4904f3cbaf
am bfa8e5d5
: am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
Change move storage from dropdown pref to dialog
2015-07-16 00:04:43 +00:00
Jason Monk
bfa8e5d53b
am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
Change move storage from dropdown pref to dialog
2015-07-15 23:48:20 +00:00
Jason Monk
e8400c2fb7
Change move storage from dropdown pref to dialog
...
Use a horizontal pref and a single button that triggers the dialog
Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Billy Lau
5742b87e5c
am 509f2fe5
: am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:39:17 +00:00
Billy Lau
509f2fe51c
am bd5ae865
: am 254ce51b
: am de784e6a
: am 52df60d8
: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
...
* commit 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
2015-07-14 19:23:52 +00:00
Billy Lau
7f70ba18e6
Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an
...
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.
Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.
Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
2015-07-13 22:39:49 +01:00
Jason Monk
d31d204958
am e86de04d
: am a992bb3d
: am 6799ef42
: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'e86de04dd6f409fd738063109e66f66ac7c17119':
Reduce jank in wifi settings
2015-06-30 14:32:33 +00:00
Jason Monk
e86de04dd6
am a992bb3d
: am 6799ef42
: Merge "Reduce jank in wifi settings" into mnc-dev
...
* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
Reduce jank in wifi settings
2015-06-30 14:21:05 +00:00
Jason Monk
6799ef423b
Merge "Reduce jank in wifi settings" into mnc-dev
2015-06-30 14:03:05 +00:00
Jorim Jaggi
0f4f09c3d3
am 6c8e6503
: am ea53bfcd
: am d9bd96b3
: Add setting to disable screenshot separately (2/2)
...
* commit '6c8e6503084845b8923b9a63c300c8f6e3dd519c':
Add setting to disable screenshot separately (2/2)
2015-06-30 01:01:18 +00:00
Jorim Jaggi
6c8e650308
am ea53bfcd
: am d9bd96b3
: Add setting to disable screenshot separately (2/2)
...
* commit 'ea53bfcddf8c8b37a154bcbdcbbec2ee71b109d9':
Add setting to disable screenshot separately (2/2)
2015-06-30 00:49:24 +00:00
Jorim Jaggi
d9bd96b309
Add setting to disable screenshot separately (2/2)
...
Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5
2015-06-29 14:50:45 -07:00
Jason Monk
55dd8869db
Reduce jank in wifi settings
...
- Fix view recycling for AccessPointPreferences by adding a dummy
during initial inflation
- Cut down on what is done during onBindView and refresh()
- Try to re-use AccessPointPreferences when possible
Some jank still occurs when scan results come in, but it is less
than before.
Bug: 16518752
Change-Id: I2619303281dd50aa3864783c49738ae9f221834a
2015-06-29 13:47:14 -04:00
Jason Monk
1342ec8505
am 4c1b0b7d
: am bdb83ba4
: am fb6e1186
: Fix accessibility for account sync
...
* commit '4c1b0b7d25b32028b5401efb39a29dac1f550867':
Fix accessibility for account sync
2015-06-25 20:16:28 +00:00
Jason Monk
4c1b0b7d25
am bdb83ba4
: am fb6e1186
: Fix accessibility for account sync
...
* commit 'bdb83ba43f834cbeb8226c0becdbbf87ec0c07ff':
Fix accessibility for account sync
2015-06-25 20:01:26 +00:00
Jason Monk
fb6e1186ab
Fix accessibility for account sync
...
Needed to get views recycling so that feedback could occur during
switch turning off.
Bug: 20020216
Change-Id: Ib7b1cdca78f5ac5064cdf521122ff7a5ee49f572
2015-06-25 15:06:00 -04:00
Alan Viverette
9f8daa9ef0
am 6d11da55
: am e7924ca8
: am 14f5da9b
: Merge "Disable foreground opacity when using default foreground color" into mnc-dev
...
* commit '6d11da55a8af056f7062b71be26428ca120bfeff':
Disable foreground opacity when using default foreground color
2015-06-22 18:14:21 +00:00
Alan Viverette
6d11da55a8
am e7924ca8
: am 14f5da9b
: Merge "Disable foreground opacity when using default foreground color" into mnc-dev
...
* commit 'e7924ca819ff7894214b935013a31d42cb95db8d':
Disable foreground opacity when using default foreground color
2015-06-22 17:41:27 +00:00
Alan Viverette
14f5da9b4d
Merge "Disable foreground opacity when using default foreground color" into mnc-dev
2015-06-22 17:20:07 +00:00
Alan Viverette
529901decd
Disable foreground opacity when using default foreground color
...
Bug: 21602597
Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
2015-06-22 10:07:19 -07:00
Adrian Roos
952471b0e3
am e14151f9
: am 5023c89d
: am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 05:44:35 +00:00
Adrian Roos
e14151f9c9
am 5023c89d
: am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit '5023c89d24723f1fc8e5b176fab476d80484b974':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:41:02 +00:00
Adrian Roos
ba59f5b222
Work around improper ListView recycling in TrustAgentSettings
...
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.
Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
2015-06-19 20:01:56 -07:00
Jason Monk
163fbd25be
am e707ea37
: am a0336eb4
: am 1a129e0f
: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
Remove battery history graph from details screen
2015-06-18 16:12:00 +00:00
Jason Monk
e707ea3720
am a0336eb4
: am 1a129e0f
: Merge "Remove battery history graph from details screen" into mnc-dev
...
* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
Remove battery history graph from details screen
2015-06-18 15:49:19 +00:00
Jason Monk
04ac693da7
Remove battery history graph from details screen
...
Bug: 21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
2015-06-18 11:07:31 -04:00
Jeff Sharkey
c162b354c2
am a39077c9
: am 67832cc3
: am 74c7f1fc
: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
Actually gracefully finish this time around.
2015-06-17 03:54:31 +00:00
Jeff Sharkey
a39077c95b
am 67832cc3
: am 74c7f1fc
: Merge "Actually gracefully finish this time around." into mnc-dev
...
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
Actually gracefully finish this time around.
2015-06-17 03:45:06 +00:00
Jeff Sharkey
665094c9d2
Actually gracefully finish this time around.
...
Also fix tinting on front-door icon.
Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
2015-06-16 20:21:12 -07:00
Jason Monk
24db3674af
am 283c469d
: am e9ec307a
: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
...
* commit '283c469dc82841827d3dd2e7052f68c5e71f1425':
Remove theme setting DO NOT MERGE
2015-06-16 21:26:03 +00:00
Jason Monk
cf611f4695
Remove theme setting DO NOT MERGE
...
Because it's just too incredibly useful...
Bug: 21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
2015-06-16 20:45:22 +00:00
John Spurlock
f2903edadc
am 3fdfabcd
: am dddd589d
: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit '3fdfabcd4576b27c37608656c277686d73833b57':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 20:01:55 +00:00
John Spurlock
dae8c154f0
Settings: Remove unreachable "Battery Info" screen.
...
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
2015-06-15 15:24:16 -04: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
Lajos Molnar
ee55eac297
developer settings: remove "Use deprecated AwesomePlayer" settings
...
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00