Daniel Nishi
8bcc2e203c
Merge "Make the storage free/total sizes consistent." into oc-dev am: b22c11ae28
...
am: e25371e8bc
Change-Id: I267abe4239c3b6b15a5a9be003f68bcc026c1ea3
2017-05-01 21:55:05 +00:00
Daniel Nishi
e25371e8bc
Merge "Make the storage free/total sizes consistent." into oc-dev
...
am: b22c11ae28
Change-Id: Ibee39375f0c714f5ff7578c24f78a387cd54bc44
2017-05-01 21:46:50 +00:00
Daniel Nishi
b22c11ae28
Merge "Make the storage free/total sizes consistent." into oc-dev
2017-05-01 21:40:23 +00:00
Jaekyun Seok
87b41e3f50
Merge "Generate license html file from xml files of partitions" into oc-dev am: 7f59081421
...
am: d3d3310ee2
Change-Id: Iaf17beaa426e4bed55f83a8a825974586ffe7868
2017-05-01 21:29:32 +00:00
Jaekyun Seok
d3d3310ee2
Merge "Generate license html file from xml files of partitions" into oc-dev
...
am: 7f59081421
Change-Id: Ia027639c81093af0defff40f2e85ddb499093652
2017-05-01 21:27:01 +00:00
TreeHugger Robot
7f59081421
Merge "Generate license html file from xml files of partitions" into oc-dev
2017-05-01 21:22:19 +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
TreeHugger Robot
0ee4e7df8e
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:59:43 +00:00
Fan Zhang
4ed4746baa
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev am: b50460086d
...
am: 5acb03575f
Change-Id: Ie8e346d71eaf4c3617753c83846cbd723582109e
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
Change-Id: I879f97321c9a3af20a1c8ec2de49c8fcf4bedbe9
2017-04-29 06:59:44 +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
Bill Yi
27dc0b5efa
Import translations. DO NOT MERGE
...
Change-Id: I0ae57f3a1b494044e26518590797977fa331a975
Auto-generated-cl: translation import
2017-04-28 19:46:17 -07:00
Jaekyun Seok
74812873f4
Generate license html file from xml files of partitions
...
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug: 37099941
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
2017-04-29 09:47:24 +09:00
Fan Zhang
d6fff53610
Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev am: 30e9474dbb
...
am: 87603385b7
Change-Id: I64197acec6cb6cc055b496198b01c954c4c1907f
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
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
.
Change-Id: If26d07a59dd9e71813a2b48f3bee25516bfb0b75
2017-04-28 21:06:28 +00:00
Doris Ling
ab5b6e7360
Merge "Add content description to the master switch toggle button." into oc-dev am: 10158feecf
...
am: 79d8e5db66
Change-Id: Ied594a8096175ad340f246af3d467629df687bc1
2017-04-28 19:41:59 +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
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
Fan Zhang
b763f04b1e
Merge "Merge pointer/tts categories into one without heading" into oc-dev am: 4f4fe03a6e
...
am: 98ec71355b
Change-Id: I02004dde71686322f76c181da0991bd58161d8ab
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
Change-Id: I0aecc05a9d2c2d8278460915d338a9b14b104854
2017-04-28 02:29:08 +00:00
Doris Ling
32927bceeb
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev am: 64857437a4
...
am: 42126366f1
Change-Id: I98e675e80fcd1e3152b02395baec3559a2f7bf62
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
Change-Id: Iabe06fbc51e2f581eb6e8b01fee99f13a70864c6
2017-04-28 02:27:52 +00:00
Sudheer Shanka
35b23bcb53
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev am: f64c5236c7
...
am: e3961b402a
Change-Id: Iaa78ed7a3883b2d89f736d4c88c1f755906ebb28
2017-04-28 02:27:20 +00:00
Maurice Lam
2a1ec7307d
Revert "Fix Robolectric test on oc-dev. DO NOT MERGE"
...
This reverts commit 8352421baa
.
Reason for revert: Not intended for master
Change-Id: Id6bb3c65e483b98a9aa4093a58460fe0bd453e05
2017-04-28 00:02:34 +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
TreeHugger Robot
646d996865
Merge "Add summary for Backup menu in Settings." into oc-dev
2017-04-27 23:20:29 +00:00
TreeHugger Robot
64857437a4
Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev
2017-04-27 23:08:20 +00:00
Fan Zhang
d57ce3af8f
Properly index developer options.
...
Change-Id: Id9ab629438f52c65fd774341b1200dacb4efd93b
Fix: 37724514
Test: make RunSettingsRoboTests
2017-04-27 16:06:32 -07:00
TreeHugger Robot
02619a6d9f
Merge "Add summary to special app access." into oc-dev
2017-04-27 22:31:48 +00:00
Doris Ling
e2ad415fdb
Add content description to the master switch toggle button.
...
Set the preference title as the toggle button's content description, so
that when user focus on the button, it will read the lable as well on
top of just "switch on" or "switch off".
Change-Id: Id1954fd54b7d38cb4e75d8b3e49d05ee694e0e41
Fix: 37618855
Test: make RunSettingsRoboTests
2017-04-27 15:09:21 -07:00
Anton Philippov
ca5e1bd67b
Add summary for Backup menu in Settings.
...
'On'/'Off' depending on whether the backup is enabled in settings.
Refactors BackupSettingsActivity to be shown on System fragment via
xml/PreferenceController instead of category in the manifest.
Bug: 36891827
Test: make RunSettingsRoboTests
Change-Id: I61425fed4d63055c6c386be38792ae074aa72679
2017-04-27 22:33:52 +01:00
Fan Zhang
496fd0ca34
Merge pointer/tts categories into one without heading
...
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix: 35960300
Test: robotests
2017-04-27 13:47:44 -07:00
Sudheer Shanka
f64c5236c7
Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev
2017-04-27 20:46:16 +00:00
Matthew Fritze
979aa9e1bb
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev am: b48e6e46b3
...
am: 6e4d02fa86
Change-Id: I2a35e242e6430fe7f68eb10d5a96177898d29933
2017-04-27 20:01:56 +00:00
TreeHugger Robot
b48e6e46b3
Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev
2017-04-27 19:50:31 +00:00
Maurice Lam
ddbbe46333
Fix Robolectric test on oc-dev. DO NOT MERGE am: 8352421baa
...
am: 9e7debc8a3
Change-Id: Ia75a0fe1332a9c0a7e8a90117a9c1fbb3b713a6c
2017-04-27 19:44:39 +00:00
Matthew Fritze
2caaa7420d
Remove search duplicates for Wifi and Bluetooth
...
Remove the master switch duplicates between the switch
and their targets. Only show the actual Wifi and Bluetooth
settings as search results.
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I226cc8db40a308bd9bcfacdd4fc6ae709fb809c5
2017-04-27 12:36:16 -07:00
Maurice Lam
8352421baa
Fix Robolectric test on oc-dev. DO NOT MERGE
...
The directories for setup wizard lib renamed on master.
Test: cd tests/robotests && mma
Bug: 37745541
Change-Id: Iffb7aa85a41a1d84c17357144f964e1d6da693be
2017-04-27 12:01:57 -07:00
Doris Ling
2e4ff90f5a
Listen to brigtness updates to update brightness summary.
...
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.
Change-Id: I611ec77174ab45315ccbee2952bdbc2c9a9cd954
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-27 10:52:31 -07:00
TreeHugger Robot
32d3d383cb
Merge "Don't show autofill settings if not enabled" into oc-dev
2017-04-27 16:43:21 +00:00
TreeHugger Robot
6e34174f72
Merge "Disable "Verify apps over usb" according to user restriction." into oc-dev
2017-04-27 16:23:06 +00:00
Philip P. Moltmann
d984e90b63
Don't show autofill settings if not enabled
...
The non-indexable keys of language-and-input on my angler are:
game_controller_settings_category, gesture_assist,
gesture_double_tap_screen, default_autofill
Fixes: 35956220
Test: Disabled auto-fill and looked at settings: did not find
autofill button and could not find auto-fill in search
Settings robolectric test
Merged-In: I0923e707422d1b1de5153a63fa3a5fe4773c055d
Change-Id: I0923e707422d1b1de5153a63fa3a5fe4773c055d
2017-04-27 15:10:02 +00:00