Commit Graph

45349 Commits

Author SHA1 Message Date
hjchangliao
6bc467a252 Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a
2018-04-27 03:32:04 +00:00
Tony Huang
e0b3323bde Merge "Update StorageSummaryDonutPreference content" into pi-dev am: 070238df13
am: 3ba6c42ab0

Change-Id: Ibb80c748317948ab1b5b62f606c06375ee0c1cc9
2018-04-26 20:09:01 -07:00
Cyril Lee
1590ce33e8 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am: 66640d6412
am: 7691959d04

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3
2018-04-26 20:08:01 -07:00
Tony Huang
3ba6c42ab0 Merge "Update StorageSummaryDonutPreference content" into pi-dev
am: 070238df13

Change-Id: If003dd4abdd28f07acc531c863b950eff69265ff
2018-04-26 20:01:14 -07:00
Cyril Lee
7691959d04 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev
am: 66640d6412

Change-Id: I781b47a12226b7ef93ee7bf6edcc43554e6a32bf
2018-04-26 20:00:20 -07:00
Tony Huang
070238df13 Merge "Update StorageSummaryDonutPreference content" into pi-dev 2018-04-27 02:58:15 +00:00
Cyril Lee
66640d6412 Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev 2018-04-27 02:53:30 +00:00
Ivan Chiang
121d53072e Merge changes I3dd31855,Id5a75217 into pi-dev am: 720a224e00
am: e598b1ae03

Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253
2018-04-26 19:13:07 -07:00
Ivan Chiang
e598b1ae03 Merge changes I3dd31855,Id5a75217 into pi-dev
am: 720a224e00

Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064
2018-04-26 19:06:38 -07:00
TreeHugger Robot
720a224e00 Merge changes I3dd31855,Id5a75217 into pi-dev
* changes:
  Show docks on previously connected devices page
  Show Dock devices in Connected devices page
2018-04-27 01:59:16 +00:00
TreeHugger Robot
0e6977da39 Merge "Slices feature supports firmware version." 2018-04-27 01:10:09 +00:00
Phil Weaver
16904e3019 Merge "Improve battery saver setting a11y semantics" into pi-dev am: 577f2af92b
am: d7d1f98fa7

Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89
2018-04-26 17:57:23 -07:00
Phil Weaver
d7d1f98fa7 Merge "Improve battery saver setting a11y semantics" into pi-dev
am: 577f2af92b

Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377
2018-04-26 17:27:12 -07:00
Phil Weaver
577f2af92b Merge "Improve battery saver setting a11y semantics" into pi-dev 2018-04-26 23:50:54 +00:00
Fan Zhang
5f492647c8 Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5f7f0f
am: 169d6a9cd6

Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
2018-04-26 16:49:32 -07:00
Fan Zhang
169d6a9cd6 Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am: 62cd5f7f0f

Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83
2018-04-26 16:40:23 -07:00
Maurice Lam
cd26201845 Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev am: fd45210510
am: 160ffd6c4c

Change-Id: Ie21d2b916927cd200eaf1195647dd983ac7594c4
2018-04-26 16:30:58 -07:00
Maurice Lam
160ffd6c4c Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am: fd45210510

Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c
2018-04-26 16:19:31 -07:00
Fan Zhang
62cd5f7f0f Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev 2018-04-26 23:12:14 +00:00
TreeHugger Robot
fd45210510 Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev 2018-04-26 22:58:37 +00:00
Lei Yu
34b82a3505 Merge "Don't show high usage tip when device is charing" into pi-dev am: 3f34ce9a5b
am: 9de539ff0f

Change-Id: I661e0cecc068f56dbd3fa1a0de32a639432a79de
2018-04-26 15:39:52 -07:00
Lei Yu
aff80459f2 Merge "Hook up Adaptive Battery to new flag." into pi-dev am: d2e9b56996
am: 59ba07c2da

Change-Id: I875f0264133f8358b4f85ccba18b672c0a05015f
2018-04-26 15:39:01 -07:00
Jason Monk
069bfaa33d Merge "Add auto-granting of slice permissions" into pi-dev am: f778a91a88
am: 8ead7e26f2

Change-Id: I27cf09c0875b72d9e9478eed410884fa3813daf1
2018-04-26 15:38:21 -07:00
Jeff Sharkey
5b210dad2e Merge "Increase volume search timeout, fix dialog flow." into pi-dev am: 2e3aacaa7a
am: 3595870fa8

Change-Id: I6d5a007bc61c4e136f75c0462df4967e1861a92d
2018-04-26 15:37:32 -07:00
Lei Yu
9de539ff0f Merge "Don't show high usage tip when device is charing" into pi-dev
am: 3f34ce9a5b

Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612
2018-04-26 15:27:26 -07:00
Lei Yu
59ba07c2da Merge "Hook up Adaptive Battery to new flag." into pi-dev
am: d2e9b56996

Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf
2018-04-26 15:26:50 -07:00
Jason Monk
8ead7e26f2 Merge "Add auto-granting of slice permissions" into pi-dev
am: f778a91a88

Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1
2018-04-26 15:26:14 -07:00
Jeff Sharkey
3595870fa8 Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am: 2e3aacaa7a

Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826
2018-04-26 15:25:05 -07:00
tmfang
1f37d190c0 Slices feature supports firmware version.
- Migrate FirmwareVersionPreferenceController to BasePreferenceController class.
- Because slices feature needs an unique uri,
  we should avoid same firmware key in my_device_info.xml and device_info_settings.xml.
- Modify test case for new firmware version controller.

Test: slice uri > content://android.settings.slices/intent/my_device_firmware_version
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: If516bbdb3ddb823db9909123ef694a2beaf5dc66
2018-04-26 15:22:01 -07:00
Lei Yu
3f34ce9a5b Merge "Don't show high usage tip when device is charing" into pi-dev 2018-04-26 22:08:55 +00:00
Lei Yu
d2e9b56996 Merge "Hook up Adaptive Battery to new flag." into pi-dev 2018-04-26 22:07:53 +00:00
Jason Monk
f778a91a88 Merge "Add auto-granting of slice permissions" into pi-dev 2018-04-26 22:05:19 +00:00
sunnyshao
c624663312 Modified the AirplaneModePreferenceController for slice
- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature

Fixes: 78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
2018-04-26 14:49:04 -07:00
Salvador Martinez
60c513d908 Merge "Only start tether when not already enabled" into pi-dev am: f62f91b0b6
am: 964d107491

Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
2018-04-26 14:30:25 -07:00
TreeHugger Robot
2e3aacaa7a Merge "Increase volume search timeout, fix dialog flow." into pi-dev 2018-04-26 21:28:16 +00:00
Jason Monk
0d3322a57b Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893
am: 2332aad2a6

Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
2018-04-26 14:26:38 -07:00
Salvador Martinez
964d107491 Merge "Only start tether when not already enabled" into pi-dev
am: f62f91b0b6

Change-Id: If28a47b85fab06484298196305e862759998a72f
2018-04-26 14:15:25 -07:00
Jason Monk
2332aad2a6 Merge "Push full slice index to device index" into pi-dev
am: 3d29ca2893

Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b
2018-04-26 14:08:36 -07:00
TreeHugger Robot
f62f91b0b6 Merge "Only start tether when not already enabled" into pi-dev 2018-04-26 20:57:57 +00:00
Jason Monk
3d29ca2893 Merge "Push full slice index to device index" into pi-dev 2018-04-26 20:48:41 +00:00
Matthew Fritze
8c9e0354b4 Merge "Index database before getting Uri Descendants" into pi-dev am: a7fd137e2d
am: 03f1fafaaf

Change-Id: I700fd063084ad0e41289feb552b3a1bfafd3cd57
2018-04-26 13:36:00 -07:00
Matthew Fritze
03f1fafaaf Merge "Index database before getting Uri Descendants" into pi-dev
am: a7fd137e2d

Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b
2018-04-26 13:27:18 -07:00
Matthew Fritze
a7fd137e2d Merge "Index database before getting Uri Descendants" into pi-dev 2018-04-26 20:14:53 +00:00
Fan Zhang
117c0fb6e6 Merge "InputMethodAndSubtypeEnabler use DashboardFragment" 2018-04-26 19:12:11 +00:00
Oscar Shu
f64502ea86 Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am: 0b302499cd
am: 1635941c9a

Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1
2018-04-26 11:40:09 -07:00
Oscar Shu
1635941c9a Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b
2018-04-26 11:25:15 -07:00
Oscar Shu
0b302499cd Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev 2018-04-26 18:16:49 +00:00
Jan Nordqvist
325dd44145 [automerger skipped] Merge "Hiding data remaining text when available space is too small." into pi-dev am: 5f6937dd88
am: 7b0651b63f  -s ours

Change-Id: I51d36b9a8248a2c1047ddd6854d7c6675057c219
2018-04-26 10:53:03 -07:00
Jan Nordqvist
7b0651b63f Merge "Hiding data remaining text when available space is too small." into pi-dev
am: 5f6937dd88

Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e
2018-04-26 10:48:03 -07:00
TreeHugger Robot
5f6937dd88 Merge "Hiding data remaining text when available space is too small." into pi-dev 2018-04-26 17:33:53 +00:00