Commit Graph

37801 Commits

Author SHA1 Message Date
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

Change-Id: I0c19439f83ff576673ab7ebf9b8e5860b7eb7dc3
2017-07-07 02:57:09 +00:00
Antony Sargent
1e673aeafb Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
am: c608cfcceb

Change-Id: I67eebf79d609eff8353255e35f04bf1ff728d497
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

Change-Id: I2e0672e71b69f35cbc0f98d9cebeebf1a6dc1af7
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

Change-Id: I9f819e3f4bf0f785f9a42592a9a37955df8e8103
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
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
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

Change-Id: Icec778e5dc5095ebeea441b75cc41a662f70cb32
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

Change-Id: Id5d5f187d588708394144eaf02004c584c97dbac
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

Change-Id: Ifeaeaf53a18932fcaa417fd97b69bf317e109a7b
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

Change-Id: I0319d997e7f7953b7aa757b217ff792ebcc19f2e
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

Change-Id: Ibd2fc5828da10cfdc1356dcb19aa25c36565e1aa
2017-07-06 22:32:01 +00:00
Daniel Nishi
959f0d59fc Merge "Shrink the music icon." into oc-dr1-dev am: e78190d124
am: a22ecac2f9

Change-Id: Ic5787c194d73c8de47f554f506c7601df00d55de
2017-07-06 22:31:34 +00:00
Daniel Nishi
b41f08ce10 Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
am: 5f27569478

Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
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

Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a
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

Change-Id: I6aa6178f142bcf0bb67957c459d86ec0618c7bd0
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

Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
2017-07-06 22:11:04 +00:00
Daniel Nishi
a22ecac2f9 Merge "Shrink the music icon." into oc-dr1-dev
am: e78190d124

Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
2017-07-06 22:10:37 +00:00
Daniel Nishi
5f27569478 Merge "Update the Storage icons." into oc-dr1-dev
am: fa47cebd55

Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
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

Change-Id: Ibf609a79a19fca98554b3ec60940163674125af9
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

Change-Id: I6a3bc29c8a1863b320bfe3f07a40f85ddeb676fd
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
Fan Zhang
2c6634a8a9 Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix: 63178369
Test: robotests
2017-07-06 17:56:47 +00:00
Matthew Fritze
aadd26e335 Merge "Check non-indexable keys for raw data" into oc-dr1-dev am: 24ba2fbdb9
am: dc2005eb6a

Change-Id: Ibcefe758e9524ae810234212ac83d385bd03d09e
2017-07-06 17:39:25 +00:00
Matthew Fritze
dc2005eb6a Merge "Check non-indexable keys for raw data" into oc-dr1-dev
am: 24ba2fbdb9

Change-Id: Iab0cb32e75fabda8e2c411391d0693107fa9d2ed
2017-07-06 17:37:46 +00:00
TreeHugger Robot
24ba2fbdb9 Merge "Check non-indexable keys for raw data" into oc-dr1-dev 2017-07-06 17:31:29 +00:00
Android Build Merger (Role)
dcf46a89cf Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89" 2017-07-06 17:31:17 +00:00
Android Build Merger (Role)
587eafe5d8 Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89" 2017-07-06 17:31:02 +00:00
Daniel Nishi
9a3388a998 Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
am: 5fc76d5a89

Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
2017-07-06 17:29:49 +00:00
Daniel Nishi
59e68a47e1 Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
am: 5fc76d5a89

Change-Id: Ief44b840ccc0d2c9fbc3b0771950f2dbc6aefbf1
2017-07-06 17:29:39 +00:00
Jeff Sharkey
fc522c677d Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.

Bug: 36056324
Test: builds, boots
Change-Id: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
2017-07-06 11:29:26 -06:00
Android Build Merger (Role)
363a3374b8 Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db am: a223ee4890" 2017-07-06 17:29:11 +00:00