OSDN Git Service
Doris Ling [Fri, 7 Jul 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
73b6a18d24
Change-Id: I5711f999c28fcdfd4cbeef0fd807e00a4687a8a2
Doris Ling [Fri, 7 Jul 2017 03:35:19 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
7091fa4882
Change-Id: I73573bcae13c54e0903c6e0a2d81a4802d39a9d9
jackqdyulei [Fri, 7 Jul 2017 03:34:51 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
c0e8d57a48
Change-Id: I961166ef36ac9523355affdd5231af658a67ed75
jackqdyulei [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
0291cbb58e
Change-Id: I7942d4ab3bd2ceb29375dd62c58ff319b9d5d9e8
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:56 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
e0d864aae1
Change-Id: Ia89bdd1f99bdc351ac0b9609e003d0d2166722c2
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:25 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
0ee38fa7eb
Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
Doris Ling [Fri, 7 Jul 2017 03:32:55 +0000 (03:32 +0000)]
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc" into oc-dr1-dev-plus-aosp
am:
abe9a99474
Change-Id: I7e4e805120d934d10fcdc0af0a82d25b007d0899
Doris Ling [Fri, 7 Jul 2017 03:31:35 +0000 (03:31 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc
am:
40822c1800
Change-Id: Id3fee0ce04f5d599c38ccea00e85c5f1bbfa1445
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:58 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:56 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:37 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:26 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Ic0867be73688beed9ddf5395ed9427572d1b5165
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:20 +0000 (03:01 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:16 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Idefefd2703b8b885cc6aa68665d629d04092d5d9
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:08 +0000 (03:01 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
Andrew Sapperstein [Fri, 7 Jul 2017 03:01:07 +0000 (03:01 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am:
4545d636ec
Change-Id: Ic602d70e1f1d05cb47054cf4b919e81793e18a39
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:01 +0000 (03:01 +0000)]
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc" into oc-dr1-dev-plus-aosp
Andrew Sapperstein [Fri, 7 Jul 2017 03:00:49 +0000 (03:00 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am:
4545d636ec
Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
Doris Ling [Fri, 7 Jul 2017 03:00:47 +0000 (03:00 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
am:
c2002db8cc
Change-Id: I82814ee82e24bb382f54a01accec1ad2da2b7c42
TreeHugger Robot [Fri, 7 Jul 2017 03:00:45 +0000 (03:00 +0000)]
Merge "Create BatterySaverReceiver"
Android Build Merger (Role) [Fri, 7 Jul 2017 03:00:14 +0000 (03:00 +0000)]
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada am:
fb2b63df05"
Doris Ling [Fri, 7 Jul 2017 02:59:44 +0000 (02:59 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
am:
c2002db8cc
Change-Id: Ia99dd8d0d9ae926d4fe09c7911c4bc10e60e397d
Android Build Merger (Role) [Fri, 7 Jul 2017 02:58:54 +0000 (02:58 +0000)]
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada am:
fb2b63df05"
TreeHugger Robot [Fri, 7 Jul 2017 02:57:36 +0000 (02:57 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada
am:
fb2b63df05
Change-Id: I04784337fe7a2ed0d3752383d781a9a446c55d1e
TreeHugger Robot [Fri, 7 Jul 2017 02:57:09 +0000 (02:57 +0000)]
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
Android Build Merger (Role) [Fri, 7 Jul 2017 02:56:52 +0000 (02:56 +0000)]
Merge "Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd am:
c608cfcceb"
Antony Sargent [Fri, 7 Jul 2017 02:55:16 +0000 (02:55 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd
am:
c608cfcceb
Change-Id: Ia3a4a17dd0c253b10be2e1bcfbad4609d0ed1d88
Antony Sargent [Fri, 7 Jul 2017 02:54:18 +0000 (02:54 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd
am:
c608cfcceb
Change-Id: I67eebf79d609eff8353255e35f04bf1ff728d497
TreeHugger Robot [Fri, 7 Jul 2017 02:38:10 +0000 (02:38 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
am:
4fffc20ada
Change-Id: I2e0672e71b69f35cbc0f98d9cebeebf1a6dc1af7
Antony Sargent [Fri, 7 Jul 2017 02:35:24 +0000 (02:35 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
am:
21423623bd
Change-Id: I9f819e3f4bf0f785f9a42592a9a37955df8e8103
TreeHugger Robot [Fri, 7 Jul 2017 02:17:29 +0000 (02:17 +0000)]
Merge "Disable suggestion on low memory devices"
TreeHugger Robot [Fri, 7 Jul 2017 02:17:15 +0000 (02:17 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 02:13:37 +0000 (02:13 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 02:02:51 +0000 (02:02 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
Rajeev Kumar [Fri, 7 Jul 2017 02:02:27 +0000 (02:02 +0000)]
Merge "Recycle TypedArray in DividerPreference.java"
TreeHugger Robot [Fri, 7 Jul 2017 01:26:48 +0000 (01:26 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:50:28 +0000 (23:50 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:46:39 +0000 (23:46 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
Rajeev Kumar [Thu, 6 Jul 2017 23:01:06 +0000 (16:01 -0700)]
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
Doris Ling [Thu, 6 Jul 2017 22:23:00 +0000 (15:23 -0700)]
Reduce spacing in condition cards.
- decrease space between title and summary by 12dp.
- decrease space below button by 7dp.
Change-Id: I9caa0507b89367960fb94bf4af07cdd5dd1dbedf
Fix:
63394014
Test: Visual
Fan Zhang [Thu, 6 Jul 2017 22:59:31 +0000 (15:59 -0700)]
Disable suggestion on low memory devices
Change-Id: I9d22170845661fc8b48b116c9b09f758926c096f
Fix:
63157777
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 5 Jul 2017 22:49:16 +0000 (15:49 -0700)]
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
jackqdyulei [Thu, 29 Jun 2017 21:20:46 +0000 (14:20 -0700)]
Update Anomaly detection framework
This cl make it could have multiple actions for each anomaly type.
This includes:
1. Add field "targetSdkVersion", "bgRestrictionEnabled" in Anomaly
2. Add new action which includes "force stop" and "background check"
3. Add "sdkVersion" and "bgRestrictionEnabled" method in BatteryUtils
4. Update BackgroundCheckAction to check sdkVersion first
5. Update serveral tests and add new test
Bug:
63037765
Test: RunSettingsRoboTests
Change-Id: Iea7a131ee57d501f7737ae4a3ba672d948d05cd8
Android Build Merger (Role) [Thu, 6 Jul 2017 22:34:15 +0000 (22:34 +0000)]
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"
Maurice Lam [Thu, 6 Jul 2017 22:33:59 +0000 (22:33 +0000)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 22:33:51 +0000 (22:33 +0000)]
Merge "Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp am:
66037a6ae6"
Maurice Lam [Thu, 6 Jul 2017 22:33:30 +0000 (22:33 +0000)]
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
Matthew Fritze [Thu, 6 Jul 2017 22:33:16 +0000 (22:33 +0000)]
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
Matthew Fritze [Thu, 6 Jul 2017 22:32:42 +0000 (22:32 +0000)]
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
Matthew Fritze [Thu, 6 Jul 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff
am:
3b32306c54
Change-Id: Ibd2fc5828da10cfdc1356dcb19aa25c36565e1aa
Daniel Nishi [Thu, 6 Jul 2017 22:31:34 +0000 (22:31 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev am:
e78190d124
am:
a22ecac2f9
Change-Id: Ic5787c194d73c8de47f554f506c7601df00d55de
Daniel Nishi [Thu, 6 Jul 2017 22:30:55 +0000 (22:30 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev am:
fa47cebd55
am:
5f27569478
Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
TreeHugger Robot [Thu, 6 Jul 2017 22:22:52 +0000 (22:22 +0000)]
Merge "App header cleanup"
Android Build Merger (Role) [Thu, 6 Jul 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
Maurice Lam [Thu, 6 Jul 2017 22:11:52 +0000 (22:11 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
am:
8218511fb7
Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a
Android Build Merger (Role) [Thu, 6 Jul 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
Matthew Fritze [Thu, 6 Jul 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I6aa6178f142bcf0bb67957c459d86ec0618c7bd0
Matthew Fritze [Thu, 6 Jul 2017 22:11:04 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
Daniel Nishi [Thu, 6 Jul 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
am:
e78190d124
Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
Daniel Nishi [Thu, 6 Jul 2017 22:10:18 +0000 (22:10 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
am:
fa47cebd55
Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
TreeHugger Robot [Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:58:01 +0000 (21:58 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:50:49 +0000 (21:50 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
Andrew Sapperstein [Thu, 6 Jul 2017 21:30:28 +0000 (14:30 -0700)]
Use config_headlineFontFamily for password screens.
These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.
Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.
Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes:
62873478
Test: manual
Rajeev Kumar [Thu, 6 Jul 2017 21:29:26 +0000 (21:29 +0000)]
Merge "1. Fix the apostrophe escaping for few strings in Settings app 2. Fix few indentation issues in strings.xml file"
Fan Zhang [Thu, 6 Jul 2017 20:36:05 +0000 (20:36 +0000)]
Fix a crash in AppInfoBase where appEntry is invalid am:
2c6634a8a9
am:
4a1245e8c1
Change-Id: Ibf609a79a19fca98554b3ec60940163674125af9
Fan Zhang [Fri, 30 Jun 2017 20:14:02 +0000 (13:14 -0700)]
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
Phil Weaver [Thu, 6 Jul 2017 20:07:33 +0000 (20:07 +0000)]
Merge "Migrate to new overlay-stopping flag"
Fan Zhang [Thu, 6 Jul 2017 19:58:06 +0000 (19:58 +0000)]
Fix a crash in AppInfoBase where appEntry is invalid
am:
2c6634a8a9
Change-Id: I6a3bc29c8a1863b320bfe3f07a40f85ddeb676fd
TreeHugger Robot [Thu, 6 Jul 2017 19:33:53 +0000 (19:33 +0000)]
Merge "Change storage migration to use quota APIs."
Rajeev Kumar [Thu, 6 Jul 2017 19:22:34 +0000 (12:22 -0700)]
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
Antony Sargent [Fri, 30 Jun 2017 22:23:01 +0000 (15:23 -0700)]
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
TreeHugger Robot [Thu, 6 Jul 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Fix race condition and optimize categoryUpdater refresh"
Fan Zhang [Wed, 5 Jul 2017 23:12:00 +0000 (16:12 -0700)]
Fix a crash in AppInfoBase where appEntry is invalid
Change-Id: Ifbea967405ddc1e1bd069ddeab170bc67b1835b4
Fix:
63178369
Test: robotests
Matthew Fritze [Thu, 6 Jul 2017 17:39:25 +0000 (17:39 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev am:
24ba2fbdb9
am:
dc2005eb6a
Change-Id: Ibcefe758e9524ae810234212ac83d385bd03d09e
Matthew Fritze [Thu, 6 Jul 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
am:
24ba2fbdb9
Change-Id: Iab0cb32e75fabda8e2c411391d0693107fa9d2ed
TreeHugger Robot [Thu, 6 Jul 2017 17:31:29 +0000 (17:31 +0000)]
Merge "Check non-indexable keys for raw data" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:17 +0000 (17:31 +0000)]
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp am:
5fc76d5a89"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:02 +0000 (17:31 +0000)]
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp am:
5fc76d5a89"
Daniel Nishi [Thu, 6 Jul 2017 17:29:49 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
am:
5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
Daniel Nishi [Thu, 6 Jul 2017 17:29:39 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
am:
5fc76d5a89
Change-Id: Ief44b840ccc0d2c9fbc3b0771950f2dbc6aefbf1
Jeff Sharkey [Thu, 6 Jul 2017 17:29:24 +0000 (11:29 -0600)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 17:29:11 +0000 (17:29 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db am:
a223ee4890"
Daniel Nishi [Thu, 6 Jul 2017 17:27:16 +0000 (17:27 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db
am:
a223ee4890
Change-Id: Iab9d00ff5ae668aff8475c4134bab8caeac7e651
Daniel Nishi [Thu, 6 Jul 2017 17:27:05 +0000 (17:27 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db
am:
a223ee4890
Change-Id: I4a4dbe87c52a2c53abd2489143d9183c72d2c4cf
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:56 +0000 (17:18 +0000)]
Merge "Merge "Unify storage calculations." into oc-dr1-dev am:
947cb367db" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 17:17:27 +0000 (17:17 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: Ia5e4650eb1922e59ee1e95b04df7377668f0538a
Daniel Nishi [Thu, 6 Jul 2017 17:15:40 +0000 (17:15 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
am:
947cb367db
Change-Id: I3923a04104b949281e487b0b8fc5a55601536e93
Fan Zhang [Wed, 5 Jul 2017 20:46:04 +0000 (13:46 -0700)]
Fix race condition and optimize categoryUpdater refresh
- In SettingsActivity, do not call updateCategories() if nothing
changed.
- In SummaryLoader, create a mapping between tile key and summary. This
is necessary to handle a race condition where category is refreshed
after summary load.
- In DashboardSummary, refresh Tile's summary to latest cache value
everytime category is refreshed.
Change-Id: I61389b8ba614ba7e34939325bada6e1bd6fa6709
Fix:
63149109
Test: robotests
Daniel Nishi [Thu, 6 Jul 2017 17:04:53 +0000 (17:04 +0000)]
Merge "Unify storage calculations." into oc-dr1-dev
Matthew Fritze [Thu, 6 Jul 2017 01:15:43 +0000 (18:15 -0700)]
Check non-indexable keys for raw data
Change-Id: I182f6757cae0ccdd07c2c38ea0f02bd4998f79be
Fixes:
63360455
Test: make RunSettingsRoboTests
Android Build Merger (Role) [Thu, 6 Jul 2017 14:11:12 +0000 (14:11 +0000)]
Merge "Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121 am:
d69f7cddb6"
Alex Kulesza [Thu, 6 Jul 2017 14:10:49 +0000 (14:10 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121
am:
d69f7cddb6
Change-Id: Ib9a4b036a4e94d5bdbb0abf7ae1f78f03120351e
Alex Kulesza [Thu, 6 Jul 2017 14:10:06 +0000 (14:10 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev am:
32812e6121
am:
d69f7cddb6
Change-Id: Id226cd9d3c2ea5bbbbc1dcedfbd273938ac477ef
Alex Kulesza [Thu, 6 Jul 2017 14:07:47 +0000 (14:07 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
am:
32812e6121
Change-Id: I9ad8579fd76516b2c3ab89571b20ac2b28a2d161
Alex Kulesza [Thu, 6 Jul 2017 14:02:26 +0000 (14:02 +0000)]
Merge "Render enhanced battery projection curves." into oc-dr1-dev
OSDN Git Service
