Daniel Sheng
9cbbe20b2f
Merge "Fixed crash when opening Camera Lift suggestion"
2017-05-01 20:15:19 +00:00
Jeff Sharkey
4869effb72
Merge "Change String to CharSequence in #loadSummary." into oc-dev am: ad597344a2
...
am: e86e611f76
2017-05-01 18:22:36 +00:00
Jeff Sharkey
e86e611f76
Merge "Change String to CharSequence in #loadSummary." into oc-dev
...
am: ad597344a2
2017-05-01 18:10:45 +00:00
Daniel Sheng
b74914eff3
Fixed crash when opening Camera Lift suggestion
...
Bug: 37742959
Test: manual + make RunSettingsRoboTests +
adb shell am instrument -w com.android.settings.tests.unit
/android.support.test.runner.AndroidJUnitRunner
Added missing SettingsGateway entry for Camera Lift Trigger settings
fragment.
Change-Id: Iddce7a672b0bb8430e3c7b3c346788fb23970636
2017-05-01 11:07:34 -07:00
Jeff Sharkey
ad597344a2
Merge "Change String to CharSequence in #loadSummary." into oc-dev
2017-05-01 17:52:27 +00:00
Meng Wang
897b93aa8b
Merge "Fix typo"
2017-05-01 17:34:34 +00:00
Jesse Evans
b519b67684
Make instant apps appear above disabled apps am: b2d85af91e
...
am: f52bfd03ea
2017-05-01 17:09:22 +00:00
Jesse Evans
f52bfd03ea
Make instant apps appear above disabled apps
...
am: b2d85af91e
2017-05-01 17:02:27 +00:00
Meng Wang
69439b5e47
Fix typo
...
eabProvisionedSwitch should use eab_provisioned_switch
Bug: 37433707
Test: make
Change-Id: Iac7c83d1bee34f9e89878b66647115427ad0bf5f
2017-05-01 08:31:14 -07:00
Jesse Evans
b2d85af91e
Make instant apps appear above disabled apps
...
Currently instant apps appear below disabled apps in the app filter
spinner, this is incorrect. This patch moves them above the disabled
apps filter option.
Test: make RunSettingsRoboTests
Bug: 37683262
Change-Id: Id65ae47baca4eac43a6a89375bdb718d5dbf7c56
2017-05-01 07:33:25 -07:00
Fan Zhang
4ed4746baa
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev am: b50460086d
...
am: 5acb03575f
2017-04-29 07:00:01 +00:00
Fan Zhang
5801c66ad7
Merge "Add emergency broadcast to app & notification settings." into oc-dev am: 908cad27ab
...
am: ae112c8a46
2017-04-29 06:59:44 +00:00
Fan Zhang
5acb03575f
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
...
am: b50460086d
2017-04-29 06:58:11 +00:00
Fan Zhang
ae112c8a46
Merge "Add emergency broadcast to app & notification settings." into oc-dev
...
am: 908cad27ab
2017-04-29 06:57:43 +00:00
TreeHugger Robot
b50460086d
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
2017-04-29 06:53:27 +00:00
TreeHugger Robot
908cad27ab
Merge "Add emergency broadcast to app & notification settings." into oc-dev
2017-04-29 06:53:12 +00:00
Philip P. Moltmann
bf4b1b0261
Merge "Add "add service" pref to the autofill picker" into oc-dev am: 9301381ac2
...
am: 586b1e4cee
2017-04-29 05:32:40 +00:00
Philip P. Moltmann
586b1e4cee
Merge "Add "add service" pref to the autofill picker" into oc-dev
...
am: 9301381ac2
2017-04-29 05:24:18 +00:00
Philip P. Moltmann
9301381ac2
Merge "Add "add service" pref to the autofill picker" into oc-dev
2017-04-29 05:14:42 +00:00
Saige McVea
2cc818acce
Change String to CharSequence in #loadSummary.
...
Per API council review, localized strings should return CharSequence. Changes here
account for the different type returned.
Test: ag/1813674
Bug: 37723508
Change-Id: I7dacab8af48932db031de22835b65eba30393956
2017-04-28 20:35:21 -07:00
Fan Zhang
d6fff53610
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev am: 30e9474dbb
...
am: 87603385b7
2017-04-28 23:43:21 +00:00
TreeHugger Robot
4e2addce97
Merge "Only show "reset app preference" actionbar menu in app info"
2017-04-28 23:28:56 +00:00
Fan Zhang
87603385b7
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
...
am: 30e9474dbb
2017-04-28 23:24:40 +00:00
TreeHugger Robot
30e9474dbb
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev
2017-04-28 23:08:20 +00:00
Fan Zhang
d53c6d57f3
Add emergency broadcast to app & notification settings.
...
Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.
Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix: 36557600
Test: robotests
2017-04-28 14:36:17 -07:00
Fan Zhang
293556d6b8
Revert "Display and parse numbers properly in all locales"
...
Bug: 37311645
This reverts commit 8648c5ed3d
2017-04-28 21:06:28 +00:00
Philip P. Moltmann
2aff7dbfda
Add "add service" pref to the autofill picker
...
Mimicing the behavior we have for adding a print service.
Fixes: 37735998
Test: - Started auto fill picker with add-service-settings set and unset.
Only if set, the preference is added
- RunSettingsRoboTests (unrelated failure in
SetupChooseLockPatternTest)
- Enable + disable auto fill service while settings is open
Change-Id: Ie019a032a1d01373f8fd0ebd7ae2ddf9c4d8871f
2017-04-28 13:57:04 -07:00
Doris Ling
ab5b6e7360
Merge "Add content description to the master switch toggle button." into oc-dev am: 10158feecf
...
am: 79d8e5db66
2017-04-28 19:41:59 +00:00
Doris Ling
79d8e5db66
Merge "Add content description to the master switch toggle button." into oc-dev
...
am: 10158feecf
2017-04-28 19:34:34 +00:00
TreeHugger Robot
10158feecf
Merge "Add content description to the master switch toggle button." into oc-dev
2017-04-28 19:24:11 +00:00
Fan Zhang
d1c41a3064
Only show "reset app preference" actionbar menu in app info
...
Because it doesn't make sense to show it in other types of app
list view.
Change-Id: Ia4f84812a6f0acc434f770b026e5ed550714087a
Fix: 36110694
Test: robotests
2017-04-28 11:47:54 -07:00
TreeHugger Robot
1e583e5d03
Merge "Add method to check whether to enable anomaly detection"
2017-04-28 18:37:38 +00:00
TreeHugger Robot
082d1d34b0
Merge "Add flag to control whether or not we should tint icons"
2017-04-28 18:16:25 +00:00
Fan Zhang
cf96674977
Don't hide network reset even if it's disabled by admin.
...
Change-Id: Ib78a3c9434c8543f3be34932264802f1065cc54b
Fix: 37134598
Test: robotests
2017-04-28 18:06:16 +00:00
TreeHugger Robot
ea63c97690
Merge "Properly index developer options."
2017-04-28 17:24:34 +00:00
Fan Zhang
0a257ee1ba
Add flag to control whether or not we should tint icons
...
Fix: 34365726
Test: robotests
Change-Id: Ic08d8590c9867fb0383da03f05237f74644a77ff
2017-04-28 09:54:33 -07:00
Felipe Leme
d35129ea3d
Merge "Check for permission when displaying AutofilLServices." into oc-dev am: 5d27ad49a3
...
am: bb542f0894
2017-04-28 03:13:47 +00:00
Felipe Leme
bb542f0894
Merge "Check for permission when displaying AutofilLServices." into oc-dev
...
am: 5d27ad49a3
2017-04-28 03:05:54 +00:00
TreeHugger Robot
5d27ad49a3
Merge "Check for permission when displaying AutofilLServices." into oc-dev
2017-04-28 02:50:04 +00:00
Fan Zhang
b763f04b1e
Merge "Merge pointer/tts categories into one without heading" into oc-dev am: 4f4fe03a6e
...
am: 98ec71355b
2017-04-28 02:29:27 +00:00
Anton Philippov
72b505869f
Merge "Add summary for Backup menu in Settings." into oc-dev am: 646d996865
...
am: d1cc1365fc
2017-04-28 02:29:08 +00:00
Glen Kuhne
b7f7621b37
Merge "Disable submit button when PSK pass is invalid" into oc-dev am: 35cc22fcf2
...
am: 7038d26861
2017-04-28 02:28:43 +00:00
Doris Ling
32927bceeb
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev am: 64857437a4
...
am: 42126366f1
2017-04-28 02:28:23 +00:00
Doris Ling
69ef213f77
Merge "Add summary to special app access." into oc-dev am: 02619a6d9f
...
am: 1081882be6
2017-04-28 02:27:52 +00:00
Fan Zhang
98ec71355b
Merge "Merge pointer/tts categories into one without heading" into oc-dev
...
am: 4f4fe03a6e
2017-04-28 00:07:42 +00:00
Anton Philippov
d1cc1365fc
Merge "Add summary for Backup menu in Settings." into oc-dev
...
am: 646d996865
2017-04-28 00:07:20 +00:00
Glen Kuhne
7038d26861
Merge "Disable submit button when PSK pass is invalid" into oc-dev
...
am: 35cc22fcf2
2017-04-28 00:07:00 +00:00
Doris Ling
42126366f1
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
...
am: 64857437a4
2017-04-28 00:06:38 +00:00
Doris Ling
1081882be6
Merge "Add summary to special app access." into oc-dev
...
am: 02619a6d9f
2017-04-28 00:06:18 +00:00
Fan Zhang
4f4fe03a6e
Merge "Merge pointer/tts categories into one without heading" into oc-dev
2017-04-27 23:34:00 +00:00
