TreeHugger Robot
6a435bbb61
Merge "resolve merge conflicts of 0ee60c0 to master"
2016-09-15 00:01:17 +00:00
TreeHugger Robot
818d7e8675
Merge "Add logging for a few dialogs in Settings."
2016-09-14 23:51:12 +00:00
Fan Zhang
661248cf3e
resolve merge conflicts of 0ee60c0 to master
...
Change-Id: Id371c6f3687dc35f87c4a93f032bfc5ca87d15ab
2016-09-14 14:14:14 -07:00
Salvador Martinez
c5f2ba0a42
Merge "Changed information string about model" into nyc-mr1-dev am: d1f38f302e
...
am: 4e30b0458a
2016-09-14 20:41:04 +00:00
Salvador Martinez
a3123c3f2f
Changed information string about model am: d92ce3ef0c
...
am: 878bb1e602
2016-09-14 20:41:04 +00:00
Salvador Martinez
4e30b0458a
Merge "Changed information string about model" into nyc-mr1-dev
...
am: d1f38f302e
2016-09-14 20:38:04 +00:00
Salvador Martinez
878bb1e602
Changed information string about model
...
am: d92ce3ef0c
2016-09-14 20:38:03 +00:00
Philip P. Moltmann
58e2b50292
USB restriction is similar to media restriction
...
Bug: 31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
2016-09-14 13:31:29 -07:00
TreeHugger Robot
d1f38f302e
Merge "Changed information string about model" into nyc-mr1-dev
2016-09-14 20:27:54 +00:00
Fan Zhang
ac5e593223
Add logging for a few dialogs in Settings.
...
Bug: 30681529
Test: Checked via adb logcat -b events |egrep'(sysui_|notification_)'
Change-Id: Ida7ce88f11fd476164f2d016ac0badcd7c549ae4
2016-09-14 13:25:28 -07:00
Amin Shaikh
e57a428d5d
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am: 1c0601b046
...
am: 438167c61d
2016-09-14 19:13:58 +00:00
Amin Shaikh
691313cad3
Fix crash when tapping on "Change Wallpaper". am: f7610f0f45
...
am: 20022a957d
2016-09-14 19:13:57 +00:00
Amin Shaikh
438167c61d
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
...
am: 1c0601b046
2016-09-14 19:11:27 +00:00
Amin Shaikh
20022a957d
Fix crash when tapping on "Change Wallpaper".
...
am: f7610f0f45
2016-09-14 19:11:26 +00:00
Amin Shaikh
1c0601b046
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
2016-09-14 18:52:54 +00:00
Salvador Martinez
d92ce3ef0c
Changed information string about model
...
The string which contained the device
model information in settings was changed
to be more general. That way the model
information provided by the phone can be
more than just a number.
Test: Manual Inspection
Bug: 31108285
Change-Id: I7caf0a874983579b0e74240661b0d9b4df68bd74
2016-09-14 11:31:43 -07:00
Fan Zhang
d9c67614de
Merge "Add ability to disable data warning." into nyc-mr1-dev am: 7b7e6260f8
...
am: 2c9e50ed26
2016-09-14 17:55:50 +00:00
Fan Zhang
2c9e50ed26
Merge "Add ability to disable data warning." into nyc-mr1-dev
...
am: 7b7e6260f8
2016-09-14 17:35:43 +00:00
Fan Zhang
0ee60c068a
Add ability to disable data warning. am: 7bd19b8891
...
am: 7c7a101a98
2016-09-14 17:35:12 +00:00
Rubin Xu
d1ba5538e0
Show approprate text when enrolling fingerprint am: ae093e2428
...
am: 307767380a
2016-09-14 17:32:21 +00:00
Fan Zhang
7c7a101a98
Add ability to disable data warning.
...
am: 7bd19b8891
2016-09-14 17:29:32 +00:00
Rubin Xu
307767380a
Show approprate text when enrolling fingerprint
...
am: ae093e2428
2016-09-14 17:29:00 +00:00
Fan Zhang
42c0d6e79f
Merge "Add string for set data warning." into nyc-mr1-dev am: c88805713d am: b33ad1419a
...
am: 3be1e1a404
2016-09-14 17:13:53 +00:00
Fan Zhang
55b61aa884
Add string for set data warning. am: d10686ff4f am: 5a0ab072f0
...
am: 6ba8fdff89
2016-09-14 17:13:51 +00:00
Matthew Fritze
611a9e4751
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev am: b5807e199f am: 6a2c42f745
...
am: f3dc6b1aab
2016-09-14 17:13:23 +00:00
Matthew Fritze
932bb2ee02
resolve merge conflicts of a04bf12 to master
...
Change-Id: Ie8b93666d98832af510e76ec50af964e2460743b
2016-09-14 09:30:01 -07:00
TreeHugger Robot
7b7e6260f8
Merge "Add ability to disable data warning." into nyc-mr1-dev
2016-09-14 16:24:19 +00:00
Fan Zhang
7bd19b8891
Add ability to disable data warning.
...
- Add a preference to disable data warning.
- Disable data usage chart in summary page when data warning is turned
off.
Bug: 26934313
Test: Manually turned on/off data warning and inspected UI.
Test: ag/1440361
Change-Id: I6d5b86b8502647781c52cf940f276e1969251b59
2016-09-14 09:22:43 -07:00
Rubin Xu
ae093e2428
Show approprate text when enrolling fingerprint
...
Inform the user that unlocking device by fingerprint is disabled if the
device admin has disallowed it.
Bug: 27201226
Change-Id: Id1694f07a9421ebfe3c777f2a6b624a836bff2d5
2016-09-14 13:53:03 +01:00
Amin Shaikh
f7610f0f45
Fix crash when tapping on "Change Wallpaper".
...
Bug: 31306517
Change-Id: I896311917d4954f78dd689bd1a40b03e7f94284e
2016-09-13 22:52:15 -07:00
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
