Matthew Fritze
14e9535fc8
resolve merge conflicts of e6431c7 to master
...
Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
2016-09-13 19:08:11 -07:00
Matthew Fritze
73f8eda988
Merge "Revert "Linked google truth to Robolectric tests and added an example.""
2016-09-14 00:41:55 +00:00
Matthew Fritze
7a78107332
Revert "Linked google truth to Robolectric tests and added an example."
...
This reverts commit 21f15a3280
2016-09-14 00:33:31 +00:00
Matthew Fritze
ba15465610
Merge "Linked google truth to Robolectric tests and added an example."
2016-09-14 00:07:48 +00:00
Fan Zhang
3be1e1a404
Merge "Add string for set data warning." into nyc-mr1-dev am: c88805713d
...
am: b33ad1419a
2016-09-13 23:25:14 +00:00
Fan Zhang
6ba8fdff89
Add string for set data warning. am: d10686ff4f
...
am: 5a0ab072f0
2016-09-13 23:25:13 +00:00
Fan Zhang
b33ad1419a
Merge "Add string for set data warning." into nyc-mr1-dev
...
am: c88805713d
2016-09-13 23:22:11 +00:00
Fan Zhang
5a0ab072f0
Add string for set data warning.
...
am: d10686ff4f
2016-09-13 23:22:10 +00:00
TreeHugger Robot
c88805713d
Merge "Add string for set data warning." into nyc-mr1-dev
2016-09-13 23:19:46 +00:00
Matthew Fritze
f3dc6b1aab
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev am: b5807e199f
...
am: 6a2c42f745
2016-09-13 23:16:55 +00:00
Matthew Fritze
a04bf124e6
Prevent Data Usage Settings crash on phones without cellular history am: 10d7e4c060
...
am: d7b12c8180
2016-09-13 23:16:48 +00:00
Matthew Fritze
e6431c79c7
Data Usage summary creates a dialog to change data warning level am: 25437d7c61
...
am: 68e8770d17
2016-09-13 23:16:42 +00:00
Matthew Fritze
6a2c42f745
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev
...
am: b5807e199f
2016-09-13 23:13:47 +00:00
Matthew Fritze
d7b12c8180
Prevent Data Usage Settings crash on phones without cellular history
...
am: 10d7e4c060
2016-09-13 23:13:46 +00:00
Matthew Fritze
68e8770d17
Data Usage summary creates a dialog to change data warning level
...
am: 25437d7c61
2016-09-13 23:13:41 +00:00
Matthew Fritze
b5807e199f
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev
...
* changes:
Prevent Data Usage Settings crash on phones without cellular history
Data Usage summary creates a dialog to change data warning level
2016-09-13 23:06:45 +00:00
Matthew Fritze
10d7e4c060
Prevent Data Usage Settings crash on phones without cellular history
...
Refactored the logic to determine the data usage summary mark which now
correctly tests for null.
Bug: 30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: make RunSettingsRoboTests
2016-09-13 22:59:53 +00:00
Felipe Leme
1255d75518
Merge "Improved storage accounting:" into nyc-mr1-dev am: 96c128cc99 am: bd91315654
...
am: 19591904c6
2016-09-13 21:35:34 +00:00
Felipe Leme
3b0a9cb54f
Improved storage accounting: am: 7358b7802f am: 49260969b7
...
am: 1469dde1a0
2016-09-13 21:35:33 +00:00
Fan Zhang
d10686ff4f
Add string for set data warning.
...
Bug: 26934313
Test: make Settings
Change-Id: I97dde849d9f0785c536b01471ab243aaccc85400
2016-09-13 12:59:22 -07:00
Matthew Fritze
25437d7c61
Data Usage summary creates a dialog to change data warning level
...
Clicking the Data usage summary preference will open the same dialog
that billing cycle does to modify data warning level. The Dialog
was abstracted to be used outside of the Billing Cycle settings
fragment.
Test: Robo tests in next cherry-pick.
Change-Id: I70398d4656b6da4233b2bfa0da6ffa7402ead69b
Fixes: 26932938
(cherry picked from commit 9fad289ca9
2016-09-13 12:56:45 -07:00
Felipe Leme
19591904c6
Merge "Improved storage accounting:" into nyc-mr1-dev am: 96c128cc99
...
am: bd91315654
2016-09-13 19:47:56 +00:00
Felipe Leme
1469dde1a0
Improved storage accounting: am: 7358b7802f
...
am: 49260969b7
2016-09-13 19:47:55 +00:00
Felipe Leme
bd91315654
Merge "Improved storage accounting:" into nyc-mr1-dev
...
am: 96c128cc99
2016-09-13 19:44:55 +00:00
Felipe Leme
49260969b7
Improved storage accounting:
...
am: 7358b7802f
2016-09-13 19:44:54 +00:00
TreeHugger Robot
96c128cc99
Merge "Improved storage accounting:" into nyc-mr1-dev
2016-09-13 19:39:23 +00:00
Fan Zhang
ae2a00fc5a
Log support disclaimer dialog visibility change.
...
Bug: 30681529
Test: RunSettingsRoboTests
Added InstrumentedDialogFragment, and use it to observe visiblity
changes in support disclaimer fragment.
Change-Id: I9f851c4769f8d59e791986fffc145d014ffde3a3
2016-09-13 11:34:21 -07:00
Felipe Leme
7358b7802f
Improved storage accounting:
...
- Removed duplicated entry for DIRECTORY_MOVIES.
- Added DIRECTORY_DOWNLOADS to Other.
- Added unaccounted data to Other.
- Changed Other description so it mention non-visible items.
Often sub-directories of /data are populated with data that Settings
doesn't have control of (for example, on /data/ramdump), so they're more
suitable to be displayed in the "Other" section.
BUG: 31091863
Fixes: 30952263
Change-Id: Ibf54f9dd96456575109e2e281f3780da84f70d92
2016-09-13 10:49:34 -07:00
Matthew Fritze
21f15a3280
Linked google truth to Robolectric tests and added an example.
...
Bug: 31252617
Change-Id: I95aefd4809b8d292fe4cbeac903b8445e6e2a5ea
Test: Target: RunSettingsRoboTests
2016-09-13 16:54:57 +00:00
Bill Yi
9fa5947b08
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9b5a8224e8 -s ours am: 507f18c577 -s ours
...
am: 546d9d139c
2016-09-13 09:46:43 +00:00
Bill Yi
21d21825bd
Import translations. DO NOT MERGE am: 44f9a3fd1e -s ours am: 3978b56311 -s ours
...
am: 69eb2d9088
2016-09-13 09:46:42 +00:00
Bill Yi
546d9d139c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9b5a8224e8 -s ours
...
am: 507f18c577
2016-09-13 08:56:42 +00:00
Bill Yi
69eb2d9088
Import translations. DO NOT MERGE am: 44f9a3fd1e -s ours
...
am: 3978b56311
2016-09-13 08:56:41 +00:00
Bill Yi
507f18c577
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 9b5a8224e8
2016-09-13 08:49:04 +00:00
Bill Yi
3978b56311
Import translations. DO NOT MERGE
...
am: 44f9a3fd1e
2016-09-13 08:49:04 +00:00
TreeHugger Robot
9b5a8224e8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-09-13 08:27:58 +00:00
Bill Yi
44f9a3fd1e
Import translations. DO NOT MERGE
...
Change-Id: Ica434ea782eeb2e8efbabe56b2c25811a824181e
Auto-generated-cl: translation import
2016-09-12 23:35:38 -07:00
Justin Klaassen
185157706c
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev am: d8a275a1d2 am: acb9809e09
...
am: 440a790c88
2016-09-13 04:56:15 +00:00
Justin Klaassen
1c1da30685
Disable NightDisplaySettingsActivity when not available am: e1a16c4f3e am: b606c9ca78
...
am: 2369ded79d
2016-09-13 04:56:14 +00:00
Justin Klaassen
440a790c88
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev am: d8a275a1d2
...
am: acb9809e09
2016-09-13 04:03:24 +00:00
Justin Klaassen
2369ded79d
Disable NightDisplaySettingsActivity when not available am: e1a16c4f3e
...
am: b606c9ca78
2016-09-13 04:03:23 +00:00
Justin Klaassen
acb9809e09
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
...
am: d8a275a1d2
2016-09-13 04:00:53 +00:00
Justin Klaassen
b606c9ca78
Disable NightDisplaySettingsActivity when not available
...
am: e1a16c4f3e
2016-09-13 04:00:53 +00:00
TreeHugger Robot
d8a275a1d2
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
2016-09-13 03:51:08 +00:00
Phil Weaver
4b2585b70d
Merge "Make a11y settings display consistent" into nyc-mr1-dev am: 9d6bce3667 am: db54ab8193
...
am: c2be318cdf
2016-09-13 02:10:11 +00:00
Phil Weaver
7382f2c15d
Make a11y settings display consistent am: 99a66b5416 am: 17fb0f6cf5
...
am: 02b9cb27bb
2016-09-13 02:10:10 +00:00
Phil Weaver
c2be318cdf
Merge "Make a11y settings display consistent" into nyc-mr1-dev am: 9d6bce3667
...
am: db54ab8193
2016-09-13 01:19:13 +00:00
Phil Weaver
02b9cb27bb
Make a11y settings display consistent am: 99a66b5416
...
am: 17fb0f6cf5
2016-09-13 01:19:12 +00:00
Phil Weaver
db54ab8193
Merge "Make a11y settings display consistent" into nyc-mr1-dev
...
am: 9d6bce3667
2016-09-13 01:13:41 +00:00
Phil Weaver
17fb0f6cf5
Make a11y settings display consistent
...
am: 99a66b5416
2016-09-13 01:13:41 +00:00
