Doris Ling
d53a828660
Merge "Update the gesture video container background color." into oc-dr1-dev am: c2002db8cc
...
am: 40822c1800
2017-07-07 03:31:35 +00:00
TreeHugger Robot
c432d19068
Merge "Create BatterySaverReceiver"
2017-07-07 03:00:45 +00:00
Android Build Merger (Role)
e074ed313e
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada am: fb2b63df05"
2017-07-07 03:00:14 +00:00
Doris Ling
40822c1800
Merge "Update the gesture video container background color." into oc-dr1-dev
...
am: c2002db8cc
2017-07-07 02:59:44 +00:00
Android Build Merger (Role)
22967dfa33
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada am: fb2b63df05"
2017-07-07 02:58:54 +00:00
TreeHugger Robot
d7dea14f0e
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada
...
am: fb2b63df05
2017-07-07 02:57:36 +00:00
TreeHugger Robot
a53d834f31
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada
...
am: fb2b63df05
2017-07-07 02:57:09 +00:00
Android Build Merger (Role)
c9a57bf3db
Merge "Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd am: c608cfcceb"
2017-07-07 02:56:52 +00:00
Antony Sargent
72947770c5
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
...
am: c608cfcceb
2017-07-07 02:55:16 +00:00
Antony Sargent
1e673aeafb
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
...
am: c608cfcceb
2017-07-07 02:54:18 +00:00
TreeHugger Robot
fb2b63df05
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
...
am: 4fffc20ada
2017-07-07 02:38:10 +00:00
Antony Sargent
c608cfcceb
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
...
am: 21423623bd
2017-07-07 02:35:24 +00:00
TreeHugger Robot
d432e07e91
Merge "Disable suggestion on low memory devices"
2017-07-07 02:17:29 +00:00
Rajeev Kumar
9b6c42557b
Merge "Recycle TypedArray in DividerPreference.java"
2017-07-07 02:02:27 +00:00
TreeHugger Robot
c2002db8cc
Merge "Update the gesture video container background color." into oc-dr1-dev
2017-07-07 01:26:48 +00:00
TreeHugger Robot
4fffc20ada
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
2017-07-06 23:50:28 +00:00
TreeHugger Robot
21423623bd
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
2017-07-06 23:46:39 +00:00
Rajeev Kumar
a93b1b6175
Recycle TypedArray in DividerPreference.java
...
1. Make sure 'TypedArray' is recycled after use with '#recycle()' in DividerPreference.java class
2. Get rid of an unused import from DividerPreference.java class
Test: make RunSettingsRoboTests -j40
Change-Id: I3baf7d51b5112583b9605fc6ec0c81f40ba76ee9
2017-07-06 16:25:08 -07:00
Fan Zhang
1e0b51218b
Disable suggestion on low memory devices
...
Change-Id: I9d22170845661fc8b48b116c9b09f758926c096f
Fix: 63157777
Test: make RunSettingsRoboTests
2017-07-06 16:13:28 -07:00
jackqdyulei
88b580a0a9
Create BatterySaverReceiver
...
Cherry-picked from oc-dev
This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.
BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.
Bug: 32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
2017-07-06 16:00:20 -07:00
Android Build Merger (Role)
120dbe43db
Merge "Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp am: 7e410cc787"
2017-07-06 22:34:15 +00:00
Maurice Lam
f43bbee2cb
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp
...
am: 7e410cc787
2017-07-06 22:33:59 +00:00
Android Build Merger (Role)
2232a7b9de
Merge "Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff" into oc-dr1-dev-plus-aosp am: 66037a6ae6"
2017-07-06 22:33:51 +00:00
Maurice Lam
99e0bbc14d
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp
...
am: 7e410cc787
2017-07-06 22:33:30 +00:00
Matthew Fritze
0f65bff283
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff" into oc-dr1-dev-plus-aosp
...
am: 66037a6ae6
2017-07-06 22:33:16 +00:00
Matthew Fritze
5352e086f4
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff" into oc-dr1-dev-plus-aosp
...
am: 66037a6ae6
2017-07-06 22:32:42 +00:00
Matthew Fritze
5883606041
Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff
...
am: 3b32306c54
2017-07-06 22:32:01 +00:00
Daniel Nishi
959f0d59fc
Merge "Shrink the music icon." into oc-dr1-dev am: e78190d124
...
am: a22ecac2f9
2017-07-06 22:31:34 +00:00
Daniel Nishi
b41f08ce10
Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
...
am: 5f27569478
2017-07-06 22:30:55 +00:00
TreeHugger Robot
e663befae4
Merge "App header cleanup"
2017-07-06 22:22:52 +00:00
Android Build Merger (Role)
7e410cc787
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp
2017-07-06 22:12:03 +00:00
Maurice Lam
1fd8a6d987
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
...
am: 8218511fb7
2017-07-06 22:11:52 +00:00
Android Build Merger (Role)
66037a6ae6
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff" into oc-dr1-dev-plus-aosp
2017-07-06 22:11:44 +00:00
Matthew Fritze
956f52d606
Merge "Add util method to get battery stats" into oc-dr1-dev
...
am: 55ad60d1ff
2017-07-06 22:11:11 +00:00
Matthew Fritze
3b32306c54
Merge "Add util method to get battery stats" into oc-dr1-dev
...
am: 55ad60d1ff
2017-07-06 22:11:04 +00:00
Daniel Nishi
a22ecac2f9
Merge "Shrink the music icon." into oc-dr1-dev
...
am: e78190d124
2017-07-06 22:10:37 +00:00
Daniel Nishi
5f27569478
Merge "Update the Storage icons." into oc-dr1-dev
...
am: fa47cebd55
2017-07-06 22:10:18 +00:00
TreeHugger Robot
8218511fb7
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
2017-07-06 22:08:51 +00:00
TreeHugger Robot
55ad60d1ff
Merge "Add util method to get battery stats" into oc-dr1-dev
2017-07-06 21:58:33 +00:00
Daniel Nishi
e78190d124
Merge "Shrink the music icon." into oc-dr1-dev
2017-07-06 21:58:01 +00:00
Daniel Nishi
fa47cebd55
Merge "Update the Storage icons." into oc-dr1-dev
2017-07-06 21:50:49 +00:00
Rajeev Kumar
190ec88a6f
Merge "1. Fix the apostrophe escaping for few strings in Settings app 2. Fix few indentation issues in strings.xml file"
2017-07-06 21:29:26 +00:00
Fan Zhang
3903e15de2
Fix a crash in AppInfoBase where appEntry is invalid am: 2c6634a8a9
...
am: 4a1245e8c1
2017-07-06 20:36:05 +00:00
Fan Zhang
75bee9bf98
App header cleanup
...
- Refactor the entity header layout to use LinearLayout and add id to
content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference
Fix: 62705377
Test: make RunSettingsRoboTests
Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
Phil Weaver
e5cd8ef7b9
Merge "Migrate to new overlay-stopping flag"
2017-07-06 20:07:33 +00:00
Fan Zhang
4a1245e8c1
Fix a crash in AppInfoBase where appEntry is invalid
...
am: 2c6634a8a9
2017-07-06 19:58:06 +00:00
TreeHugger Robot
860dc6d448
Merge "Change storage migration to use quota APIs."
2017-07-06 19:33:53 +00:00
Rajeev Kumar
88f5dd165d
1. Fix the apostrophe escaping for few strings in Settings app
...
2. Fix few indentation issues in strings.xml file
Test: Manually tested it.
Change-Id: I8f3e7c213614c26fc835b646289ce7fd01d5b626
2017-07-06 12:32:11 -07:00
Antony Sargent
b6fc6e31a5
Add a confirmation dialog when forgetting BT device
...
This adds a confirmation dialog for when you hit the "Forget" button to
unpair with a device from the Bluetooth device details page.
Bug: 37955181
Test: make RunSettingsRoboTests
Change-Id: I7643ed09bf363c48078d6de8a47583bf91fc7729
2017-07-06 12:24:32 -07:00
TreeHugger Robot
0002680697
Merge "Fix race condition and optimize categoryUpdater refresh"
2017-07-06 18:54:43 +00:00
