Anton Hansson
57dc4a18c2
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
...
am: 02e3229580
2018-03-07 11:51:48 +00:00
Anton Hansson
02e3229580
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
2018-03-07 11:27:19 +00:00
Bernardo Rufino
7f1308b373
Catch SecurityException from enabling backup activity am: 368b5a6b2c
...
am: 819f53a7ee
2018-03-07 11:09:51 +00:00
Victor Chang
07a396adb9
Merge "New time zone picker page"
2018-03-07 11:02:49 +00:00
Bernardo Rufino
819f53a7ee
Catch SecurityException from enabling backup activity
...
am: 368b5a6b2c
2018-03-07 11:02:45 +00:00
Victor Chang
335c0621d2
Enable new time zone picker
...
- Change the UI test due to UI changes
Bug: 73952488
Test: m RunSettingsRoboTest
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6d5716347e9debf429b757f1edd4118e86b70fab
2018-03-07 09:25:42 +00:00
Victor Chang
b7d588f341
New time zone picker page
...
- Show current selected region and time zone in a 2 rows.
Defailed info of current selected time zone in footer
- Show option menu to switch to select UTC offset
- This picker will be changed to the default picker in a later CL
Bug: 73952488
Test: m RunSettingsRoboTests
Change-Id: Ia81bb022e1021369612f5bd60c2c1f4d08db2af8
2018-03-07 09:25:38 +00:00
Bernardo Rufino
368b5a6b2c
Catch SecurityException from enabling backup activity
...
Cases where the activity is already enabled and the account is an unicorn
account.
Test: Opened activity from backup settings w/ unicorn account, verified
no crash
Bug: 74199770
Change-Id: I7dc30d22b186ff19cf7c40fda0363ff1288224d1
2018-03-07 08:49:31 +00:00
Yoshinori Hirano
68d626a2a2
Merge "Add SettingsMultiSelectListPreference style" into pi-dev am: 106825383a
...
am: fd8527901e
2018-03-07 06:57:28 +00:00
Doris Ling
88da3a7415
Merge "Add strings for audio output switcher." into pi-dev am: 6775ff9542
...
am: 9f6608a729
2018-03-07 06:50:50 +00:00
jackqdyulei
01fad80d18
Merge changes from topic "tip_new_page-pi-dev" into pi-dev am: a276b8d580
...
am: da31b26d8b
2018-03-07 06:38:02 +00:00
jackqdyulei
579b27c215
Merge "Add auto restriction preference" into pi-dev am: f178692bc5
...
am: 3968b061e8
2018-03-07 05:18:20 +00:00
Fan Zhang
0aeb4b6d81
Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev am: 710207f024
...
am: f90db69a3c
2018-03-07 05:17:05 +00:00
Doris Ling
c6ed3b82be
Merge "Add intent fields when launching instant app." into pi-dev am: dce675c158
...
am: 5675610456
2018-03-07 05:16:37 +00:00
Doris Ling
5cb3973d0a
Merge "Fix crash in battery info settings page." into pi-dev am: 83d9047ef4
...
am: b5884f48d5
2018-03-07 04:29:10 +00:00
jackqdyulei
36249c6254
Update dabase manager to store the uid
...
Also update the AppInfo to store the uid
Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: I373242a12e9dbf48be134f2e9be30831b09f91c9
2018-03-07 04:20:13 +00:00
Yoshinori Hirano
fd8527901e
Merge "Add SettingsMultiSelectListPreference style" into pi-dev
...
am: 106825383a
2018-03-07 04:19:47 +00:00
Doris Ling
9f6608a729
Merge "Add strings for audio output switcher." into pi-dev
...
am: 6775ff9542
2018-03-07 04:17:56 +00:00
jackqdyulei
da31b26d8b
Merge changes from topic "tip_new_page-pi-dev" into pi-dev
...
am: a276b8d580
2018-03-07 04:10:32 +00:00
TreeHugger Robot
106825383a
Merge "Add SettingsMultiSelectListPreference style" into pi-dev
2018-03-07 03:47:20 +00:00
TreeHugger Robot
6775ff9542
Merge "Add strings for audio output switcher." into pi-dev
2018-03-07 03:42:13 +00:00
TreeHugger Robot
a276b8d580
Merge changes from topic "tip_new_page-pi-dev" into pi-dev
...
* changes:
Hook up the new page to PowerUsageSummary
Create new PowerUsageAdvanced page
Change current PowerUsageAdvanced to legacy code
2018-03-07 03:40:50 +00:00
jackqdyulei
3968b061e8
Merge "Add auto restriction preference" into pi-dev
...
am: f178692bc5
2018-03-07 03:29:43 +00:00
Maurice Lam
ad554244b6
Hide options button when user starts entering pattern
...
Test: cd tests/robotests && mma
Bug: 72409245
Change-Id: I82ab8822f13bc8bf8b74bc67f6d4d3a9fd2cc0c8
2018-03-06 19:22:52 -08:00
Fan Zhang
f90db69a3c
Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev
...
am: 710207f024
2018-03-07 03:22:18 +00:00
Doris Ling
5675610456
Merge "Add intent fields when launching instant app." into pi-dev
...
am: dce675c158
2018-03-07 03:01:09 +00:00
TreeHugger Robot
f178692bc5
Merge "Add auto restriction preference" into pi-dev
2018-03-07 02:32:17 +00:00
jackqdyulei
0ed66a4120
Add dump log for BatteryTip.
...
Since BatteryTipLoader will dump all BatteryTips, so we only need
to add toString() for it.
Bug: 74246970
Test: RunSettingsRoboTests
Change-Id: I0a89c4ac06d107274d47f8b4b66867373c062c1b
2018-03-06 18:21:16 -08:00
Yoshinori Hirano
447192f903
Add SettingsMultiSelectListPreference style
...
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.
Fixes: 66928311
Test: manual - Add a new APN and tap Bearer
Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
2018-03-06 17:45:07 -08:00
Doris Ling
b5884f48d5
Merge "Fix crash in battery info settings page." into pi-dev
...
am: 83d9047ef4
2018-03-07 01:44:09 +00:00
TreeHugger Robot
710207f024
Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev
2018-03-07 01:21:20 +00:00
jackqdyulei
094278e636
Hook up the new page to PowerUsageSummary
...
Add a menu to point to the new page
Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
Merged-In: I9956e349cdbbe2cd752bdf65020a540a329bdee3
2018-03-06 17:20:06 -08:00
Lei Yu
f5faa3b322
Merge "Fix the test crash in fuelgauge"
2018-03-07 01:08:01 +00:00
jackqdyulei
0cee65c502
Fix the test crash in fuelgauge
...
To make sure the search works fine, We should provide a lopper
in BatteryAppListPreferenceController.
Bug: 74261698
Test: crash test pass
Change-Id: I97785dd35bbb0852b219dbeaf8e7d7835cd29b97
2018-03-06 17:02:30 -08:00
Victor Chang
53bad6b0dd
Merge "Time zone, Region, UTC picker" into pi-dev am: 2e79a7cc42
...
am: b6ebf73183
2018-03-07 01:02:13 +00:00
TreeHugger Robot
dce675c158
Merge "Add intent fields when launching instant app." into pi-dev
2018-03-07 00:59:20 +00:00
Bill Yi
0b8c98c03b
Merge "Import translations. DO NOT MERGE" into pi-dev am: bcf3e12556 -s ours
...
am: 3a2ffddc3a
2018-03-07 00:40:03 +00:00
jackqdyulei
31a5960424
Create new PowerUsageAdvanced page
...
This page contains the graph at the top and app list at the bottom
In this cl, we reused some part of the code in PowerUsageAdvancedLegacy
to construct the graph, and also used controller to construct the app
list(So glad that we extracted it to controller before..)
Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I30afbc0327a5186f8280f5e3678330b363e2dc0d
Merged-In: I30afbc0327a5186f8280f5e3678330b363e2dc0d
2018-03-06 16:10:30 -08:00
Victor Chang
b6ebf73183
Merge "Time zone, Region, UTC picker" into pi-dev
...
am: 2e79a7cc42
2018-03-06 23:34:01 +00:00
jackqdyulei
d0086188d2
Change current PowerUsageAdvanced to legacy code
...
In future cl, we will create new PowerUsageAdvanced page.
Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
Merged-In: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
2018-03-06 15:27:20 -08:00
Doris Ling
7b59cde2ce
Add strings for audio output switcher.
...
Bug: 74130772
Test: rebuild
Change-Id: I84b702b69cc0cd23caeebb441ad8310b56441b5b
2018-03-06 15:15:01 -08:00
Alex Cruz
179cb304fd
Merge "Change encryption preference's summary accordingly" into pi-dev am: 5218829f68
...
am: fc21073438
2018-03-06 23:04:19 +00:00
Bill Yi
3a2ffddc3a
Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: bcf3e12556
2018-03-06 23:02:26 +00:00
Alex Cruz
178054edd6
Merge "DO NOT MERGE: Change encryption preference's summary accordingly" am: ab5a3898f5 -s ours am: 8704b90878 -s ours
...
am: a09731f592
2018-03-06 22:53:01 +00:00
Fan Zhang
4fdf0b461d
Stop wrapping RoundedHomepageIcon if it's already wrapped.
...
On homepage, if an icon is already wrapped in RoundedHomepageIcon, we
shouldn't wrap it more. Otherwise each time we do this it will add a few
dp padding around the bitmap.
Change-Id: I5313a38f4bd128272d7b4e05209aaee72c690c55
Fixes: 73295342
Test: robotest
2018-03-06 14:52:03 -08:00
TreeHugger Robot
83d9047ef4
Merge "Fix crash in battery info settings page." into pi-dev
2018-03-06 22:47:15 +00:00
Weilun Du
cd090f72ba
Merge "Disable bluetooth controller if unsupported"
2018-03-06 22:10:06 +00:00
Doris Ling
c843667e9a
Merge "Create a new list when building suggestion data." into pi-dev am: b76682afcb
...
am: 8aaf313532
2018-03-06 22:04:12 +00:00
Victor Chang
2e79a7cc42
Merge "Time zone, Region, UTC picker" into pi-dev
2018-03-06 22:01:35 +00:00
TreeHugger Robot
bcf3e12556
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-06 21:59:34 +00:00
