OSDN Git Service
Julia Reynolds [Thu, 15 Sep 2016 17:16:44 +0000 (17:16 +0000)]
Non-blockable notification packages can't be blocked. am:
77b1f52574
am:
d8a033cca5
Change-Id: Ibf527a51f6f16348b8ca245685f5325cbdab31b4
Julia Reynolds [Thu, 15 Sep 2016 17:08:58 +0000 (17:08 +0000)]
Non-blockable notification packages can't be blocked.
am:
77b1f52574
Change-Id: I3b202fcb17e36960d97ecf10d60b99e688c9914f
Lorenzo Colitti [Thu, 15 Sep 2016 16:17:02 +0000 (16:17 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access. am:
1449ecd460 am:
a4aa79bb69
am:
0e92ddbc1b
Change-Id: I346f3b3267c3108db8fec585a0d0b7c54934b37e
Lorenzo Colitti [Thu, 15 Sep 2016 16:10:46 +0000 (16:10 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access. am:
1449ecd460
am:
a4aa79bb69
Change-Id: I2558b419cdb5897ed8b3cd2c36c52411eab48936
Lorenzo Colitti [Thu, 15 Sep 2016 16:05:53 +0000 (16:05 +0000)]
Support displaying a dialog when Wi-Fi loses Internet access.
am:
1449ecd460
Change-Id: I835eeb9165e726e20c26c47fb4e20fbd6d9e3f5a
Lorenzo Colitti [Thu, 15 Sep 2016 05:06:46 +0000 (14:06 +0900)]
Support displaying a dialog when Wi-Fi loses Internet access.
Bug:
31075769
Change-Id: Ia0c76d80591937dc40765c437e5779f3b6dde217
Salvador Martinez [Wed, 14 Sep 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev am:
d1f38f302e
am:
4e30b0458a
Change-Id: I12c1a89caf5ece1e179297f581f5e2d73439bd96
Salvador Martinez [Wed, 14 Sep 2016 20:41:04 +0000 (20:41 +0000)]
Changed information string about model am:
d92ce3ef0c
am:
878bb1e602
Change-Id: I819151689726d9f04116fe5fae7f1160dda5df2b
Salvador Martinez [Wed, 14 Sep 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev
am:
d1f38f302e
Change-Id: I4803e43fe8369a266c19a58e2955548581c15348
Salvador Martinez [Wed, 14 Sep 2016 20:38:03 +0000 (20:38 +0000)]
Changed information string about model
am:
d92ce3ef0c
Change-Id: Ia6bd630c8e273eb3613dcb5c597bd89e6de17454
TreeHugger Robot [Wed, 14 Sep 2016 20:27:53 +0000 (20:27 +0000)]
Merge "Changed information string about model" into nyc-mr1-dev
Amin Shaikh [Wed, 14 Sep 2016 19:13:58 +0000 (19:13 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev am:
1c0601b046
am:
438167c61d
Change-Id: Ibcd25fa3e77f870e32eefc291e3ddb6ea698d459
Amin Shaikh [Wed, 14 Sep 2016 19:13:57 +0000 (19:13 +0000)]
Fix crash when tapping on "Change Wallpaper". am:
f7610f0f45
am:
20022a957d
Change-Id: Iffd960c32ef2100b525d1cc276e883ffa2b0648a
Amin Shaikh [Wed, 14 Sep 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
am:
1c0601b046
Change-Id: I307d81f183ebfcc9bb1308382d8fbf357a0e6479
Amin Shaikh [Wed, 14 Sep 2016 19:11:26 +0000 (19:11 +0000)]
Fix crash when tapping on "Change Wallpaper".
am:
f7610f0f45
Change-Id: I0d321cc94af45bea0dd1dfaa82df21c4b95a8456
Amin Shaikh [Wed, 14 Sep 2016 18:52:53 +0000 (18:52 +0000)]
Merge "Fix crash when tapping on "Change Wallpaper"." into nyc-mr1-dev
Salvador Martinez [Wed, 14 Sep 2016 18:27:54 +0000 (11:27 -0700)]
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
Fan Zhang [Wed, 14 Sep 2016 17:55:50 +0000 (17:55 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev am:
7b7e6260f8
am:
2c9e50ed26
Change-Id: I1a612a4736e21c17eb61778f8e02c360421f19e8
Fan Zhang [Wed, 14 Sep 2016 17:35:43 +0000 (17:35 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev
am:
7b7e6260f8
Change-Id: Ie6bba0ec915035e28005b12ee6ff21285734d864
Fan Zhang [Wed, 14 Sep 2016 17:35:12 +0000 (17:35 +0000)]
Add ability to disable data warning. am:
7bd19b8891
am:
7c7a101a98
Change-Id: Ie752bc73c9034402efc478a0b1631ad7aec3934c
Rubin Xu [Wed, 14 Sep 2016 17:32:21 +0000 (17:32 +0000)]
Show approprate text when enrolling fingerprint am:
ae093e2428
am:
307767380a
Change-Id: I5cd78f269d54b0c208ccebcce686ad0e73dabf65
Fan Zhang [Wed, 14 Sep 2016 17:29:32 +0000 (17:29 +0000)]
Add ability to disable data warning.
am:
7bd19b8891
Change-Id: Ibde5eb39a32e836c2ae30f036998d19523efcd9b
Rubin Xu [Wed, 14 Sep 2016 17:29:00 +0000 (17:29 +0000)]
Show approprate text when enrolling fingerprint
am:
ae093e2428
Change-Id: I536e3bafd65461038544e6f24e35bac902d768bc
TreeHugger Robot [Wed, 14 Sep 2016 16:24:18 +0000 (16:24 +0000)]
Merge "Add ability to disable data warning." into nyc-mr1-dev
Fan Zhang [Mon, 12 Sep 2016 22:00:53 +0000 (15:00 -0700)]
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
Rubin Xu [Thu, 1 Sep 2016 14:03:51 +0000 (15:03 +0100)]
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
Amin Shaikh [Wed, 14 Sep 2016 05:52:15 +0000 (22:52 -0700)]
Fix crash when tapping on "Change Wallpaper".
Bug:
31306517
Change-Id: I896311917d4954f78dd689bd1a40b03e7f94284e
Fan Zhang [Tue, 13 Sep 2016 23:25:14 +0000 (23:25 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev am:
c88805713d
am:
b33ad1419a
Change-Id: Ifc74efafce9fb002265d1099977f473a7af50171
Fan Zhang [Tue, 13 Sep 2016 23:25:13 +0000 (23:25 +0000)]
Add string for set data warning. am:
d10686ff4f
am:
5a0ab072f0
Change-Id: I847b02df7c58f33bff865c7d419b168c5325d155
Fan Zhang [Tue, 13 Sep 2016 23:22:11 +0000 (23:22 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev
am:
c88805713d
Change-Id: I7f1efdeb01c4cbe2c74290411b658c6efc997c8f
Fan Zhang [Tue, 13 Sep 2016 23:22:10 +0000 (23:22 +0000)]
Add string for set data warning.
am:
d10686ff4f
Change-Id: I6b923a13339955e8c5a22da4258390e0a85ad2b5
TreeHugger Robot [Tue, 13 Sep 2016 23:19:45 +0000 (23:19 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev
Matthew Fritze [Tue, 13 Sep 2016 23:16:55 +0000 (23:16 +0000)]
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev am:
b5807e199f
am:
6a2c42f745
Change-Id: I966cbe26ee6e2748418ec1eae1b5987d7fe2b30a
Matthew Fritze [Tue, 13 Sep 2016 23:16:48 +0000 (23:16 +0000)]
Prevent Data Usage Settings crash on phones without cellular history am:
10d7e4c060
am:
d7b12c8180
Change-Id: I7353ad43ddce8d37dfdda8e13e1d5b5df7aecfa0
Matthew Fritze [Tue, 13 Sep 2016 23:16:42 +0000 (23:16 +0000)]
Data Usage summary creates a dialog to change data warning level am:
25437d7c61
am:
68e8770d17
Change-Id: I0524bddab4a490ed30fdbff5b5a42d7e9d95b686
Matthew Fritze [Tue, 13 Sep 2016 23:13:47 +0000 (23:13 +0000)]
Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev
am:
b5807e199f
Change-Id: I22600ded34079ba796b8e124b75a9d6f7799653d
Matthew Fritze [Tue, 13 Sep 2016 23:13:46 +0000 (23:13 +0000)]
Prevent Data Usage Settings crash on phones without cellular history
am:
10d7e4c060
Change-Id: Ic6bcdd378ab19a70dee11e7fc352cd54903309bd
Matthew Fritze [Tue, 13 Sep 2016 23:13:41 +0000 (23:13 +0000)]
Data Usage summary creates a dialog to change data warning level
am:
25437d7c61
Change-Id: I7a5be447ccbff41c4114f2a8146c8432f8dbf896
Matthew Fritze [Tue, 13 Sep 2016 23:06:44 +0000 (23:06 +0000)]
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
Matthew Fritze [Tue, 23 Aug 2016 00:40:02 +0000 (17:40 -0700)]
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
Fan Zhang [Tue, 13 Sep 2016 19:59:22 +0000 (12:59 -0700)]
Add string for set data warning.
Bug:
26934313
Test: make Settings
Change-Id: I97dde849d9f0785c536b01471ab243aaccc85400
Matthew Fritze [Fri, 12 Aug 2016 16:37:43 +0000 (09:37 -0700)]
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
9fad289ca95d2ce0c44d01e0668bdaffba4404d9)
Felipe Leme [Tue, 13 Sep 2016 19:47:56 +0000 (19:47 +0000)]
Merge "Improved storage accounting:" into nyc-mr1-dev am:
96c128cc99
am:
bd91315654
Change-Id: I2228b394469da0242f0a961f478081fb5a26bf8b
Felipe Leme [Tue, 13 Sep 2016 19:47:55 +0000 (19:47 +0000)]
Improved storage accounting: am:
7358b7802f
am:
49260969b7
Change-Id: If4dc3b03fe521d91002a00beb9230caef1100a46
Felipe Leme [Tue, 13 Sep 2016 19:44:55 +0000 (19:44 +0000)]
Merge "Improved storage accounting:" into nyc-mr1-dev
am:
96c128cc99
Change-Id: I2acba417e0d6af66ca97344133c688eaffb181bb
Felipe Leme [Tue, 13 Sep 2016 19:44:54 +0000 (19:44 +0000)]
Improved storage accounting:
am:
7358b7802f
Change-Id: Ie5839177bf44a0269e04d17a2f33012e3029ab38
TreeHugger Robot [Tue, 13 Sep 2016 19:39:22 +0000 (19:39 +0000)]
Merge "Improved storage accounting:" into nyc-mr1-dev
Felipe Leme [Tue, 30 Aug 2016 22:06:24 +0000 (15:06 -0700)]
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
Bill Yi [Tue, 13 Sep 2016 08:56:42 +0000 (08:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9b5a8224e8 -s ours
am:
507f18c577 -s ours
Change-Id: Icb6002f26a57a5539aa55faec20a11c5e68d3a60
Bill Yi [Tue, 13 Sep 2016 08:56:41 +0000 (08:56 +0000)]
Import translations. DO NOT MERGE am:
44f9a3fd1e -s ours
am:
3978b56311 -s ours
Change-Id: Idf9affe16dd82e63503b1a8bc908cdd64e7ccc3b
Bill Yi [Tue, 13 Sep 2016 08:49:04 +0000 (08:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
9b5a8224e8 -s ours
Change-Id: If68c92dfe3f3a3f5f0ac814179c7b79673394267
Bill Yi [Tue, 13 Sep 2016 08:49:04 +0000 (08:49 +0000)]
Import translations. DO NOT MERGE
am:
44f9a3fd1e -s ours
Change-Id: I1894dccc51fc55d158197f5da2ea62333f01ee84
TreeHugger Robot [Tue, 13 Sep 2016 08:27:58 +0000 (08:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 13 Sep 2016 06:35:38 +0000 (23:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica434ea782eeb2e8efbabe56b2c25811a824181e
Auto-generated-cl: translation import
Justin Klaassen [Tue, 13 Sep 2016 04:03:24 +0000 (04:03 +0000)]
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev am:
d8a275a1d2
am:
acb9809e09
Change-Id: I34e004df56d69e4d8ade99876a02cd0944be4c34
Justin Klaassen [Tue, 13 Sep 2016 04:03:23 +0000 (04:03 +0000)]
Disable NightDisplaySettingsActivity when not available am:
e1a16c4f3e
am:
b606c9ca78
Change-Id: I2ecc3899a85471cc928b3fe4d8500f3f3460bc95
Justin Klaassen [Tue, 13 Sep 2016 04:00:53 +0000 (04:00 +0000)]
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
am:
d8a275a1d2
Change-Id: Id01768d67598b6f7ff93450b6df6e07d4f38ee06
Justin Klaassen [Tue, 13 Sep 2016 04:00:53 +0000 (04:00 +0000)]
Disable NightDisplaySettingsActivity when not available
am:
e1a16c4f3e
Change-Id: I3c2bf9f76177af40bf0f2025978c7c9f34181004
TreeHugger Robot [Tue, 13 Sep 2016 03:51:07 +0000 (03:51 +0000)]
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
Phil Weaver [Tue, 13 Sep 2016 01:19:13 +0000 (01:19 +0000)]
Merge "Make a11y settings display consistent" into nyc-mr1-dev am:
9d6bce3667
am:
db54ab8193
Change-Id: I7a4b3b6679028027c0141ce9e38c27b208abc3fc
Phil Weaver [Tue, 13 Sep 2016 01:19:12 +0000 (01:19 +0000)]
Make a11y settings display consistent am:
99a66b5416
am:
17fb0f6cf5
Change-Id: Iebeeb744a08d0a89803d8743dbe85950b1320147
Phil Weaver [Tue, 13 Sep 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Make a11y settings display consistent" into nyc-mr1-dev
am:
9d6bce3667
Change-Id: I8bbb9d0c8d604bd4f250911c9aa4fc96f0114251
Phil Weaver [Tue, 13 Sep 2016 01:13:41 +0000 (01:13 +0000)]
Make a11y settings display consistent
am:
99a66b5416
Change-Id: Ic62d9ac58ebab8e52d9bb22c7c377d640fc027bb
Phil Weaver [Tue, 13 Sep 2016 01:07:05 +0000 (01:07 +0000)]
Merge "Make a11y settings display consistent" into nyc-mr1-dev
Justin Klaassen [Tue, 13 Sep 2016 00:04:33 +0000 (17:04 -0700)]
Disable NightDisplaySettingsActivity when not available
Not every device supports "Night Light" so this change disables the
NightDisplaySettingsActivity entry point using the system internal
R.bool.config_nightDisplayAvailable value.
Fixes:
30919608
Test: adb shell am start -a android.settings.NIGHT_DISPLAY_SETTINGS
Change-Id: I202c93069daaea08a0d754dd2f6b3de8c249c361
Phil Weaver [Sat, 10 Sep 2016 00:36:03 +0000 (17:36 -0700)]
Make a11y settings display consistent
We were using two methods to decide whether or not to show
that an a11y service was enabled, one on the main
Accessibility screen and another on the individual service
screen. In some situations, an enabled service would show
up as enabled on the main screen but not enabled on its
individual screen.
Bug:
30829589
Change-Id: I560d86684a2fb8987d3dd06279e033ecb7cc1a58
Justin Klaassen [Mon, 12 Sep 2016 21:02:53 +0000 (21:02 +0000)]
Update Night Light summary strings am:
ed765a4817
am:
82926aebdf
Change-Id: I861f710b4de7d034dddd4c4de1bec5e3e32ca0c7
Justin Klaassen [Mon, 12 Sep 2016 21:00:57 +0000 (21:00 +0000)]
Update Night Light summary strings
am:
ed765a4817
Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b
Justin Klaassen [Mon, 12 Sep 2016 18:40:03 +0000 (11:40 -0700)]
Update Night Light summary strings
Bug:
30771506
Test: Verified new strings show up in Night Light settings.
Change-Id: I36cc92d2644016f8f417daf9c06bccbe9fbd2d8c
Julia Reynolds [Mon, 12 Sep 2016 14:11:24 +0000 (10:11 -0400)]
Non-blockable notification packages can't be blocked.
Bug:
31404047
Change-Id: Icbe7e5e57983d281f6fe21e9b4715c822784d43c
Fyodor Kupolov [Fri, 9 Sep 2016 23:49:48 +0000 (23:49 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am:
4b60607038
am:
0ec8187b46
Change-Id: I19dd337b94def9efa9ed5a7f152a11783be4e311
Fyodor Kupolov [Fri, 9 Sep 2016 23:49:47 +0000 (23:49 +0000)]
Ignore onPreferenceChange for top level preference am:
bf88b269ca
am:
26a0f7037a
Change-Id: I491a5df37f1df3d9cd02dacabb69c57c287d686c
Fyodor Kupolov [Fri, 9 Sep 2016 23:46:50 +0000 (23:46 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
am:
4b60607038
Change-Id: Ifbdf9af6b7119e9d5b696ab9e95b7a8a384c6138
Fyodor Kupolov [Fri, 9 Sep 2016 23:46:49 +0000 (23:46 +0000)]
Ignore onPreferenceChange for top level preference
am:
bf88b269ca
Change-Id: Ib5208cb8b7d1a0bbaeed4ddbdbf6c15bce8b1b49
Fyodor Kupolov [Fri, 9 Sep 2016 23:30:35 +0000 (23:30 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
Jim Miller [Fri, 9 Sep 2016 20:27:11 +0000 (20:27 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev am:
ca9a78f2d1
am:
cfc960df98
Change-Id: I24dc1a67ba334c05e70a4a81d62864e37bea2596
Jim Miller [Fri, 9 Sep 2016 20:27:10 +0000 (20:27 +0000)]
Check for missing preference before setting title. am:
06458be226
am:
68306c3409
Change-Id: Ibfeb785327d497fad3e8bff4de3b183ff5657fd2
Jim Miller [Fri, 9 Sep 2016 20:21:48 +0000 (20:21 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev
am:
ca9a78f2d1
Change-Id: I51aa91e1216c23773604a26ab3dabe0d4f5257aa
Jim Miller [Fri, 9 Sep 2016 20:21:47 +0000 (20:21 +0000)]
Check for missing preference before setting title.
am:
06458be226
Change-Id: I1bbca453c4f58554bf7ec96a211496e3bce2acac
TreeHugger Robot [Fri, 9 Sep 2016 20:15:12 +0000 (20:15 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev
Jim Miller [Fri, 9 Sep 2016 18:54:12 +0000 (11:54 -0700)]
Check for missing preference before setting title.
Some preferences aren't available due to DPM, so check for null
before setting the title.
Fixes bug
31184335
Change-Id: I69f97274eef87755269fd8f7897edcc36087f8b2
Todd Kennedy [Fri, 9 Sep 2016 02:06:58 +0000 (02:06 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev am:
e162563e10
am:
26c4f2b42e
Change-Id: I67e1979fe2b3518840881868f4735e6d4767cd59
Todd Kennedy [Fri, 9 Sep 2016 02:06:57 +0000 (02:06 +0000)]
Direct launch to web action am:
2ef1aa5894
am:
de2da206af
Change-Id: Iea7aefc5ca85f7083f37ff678933aa293694ff97
Todd Kennedy [Fri, 9 Sep 2016 01:59:33 +0000 (01:59 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev
am:
e162563e10
Change-Id: Icafef8093cae5e4838be46d39405175b91c3bbbf
Todd Kennedy [Fri, 9 Sep 2016 01:59:32 +0000 (01:59 +0000)]
Direct launch to web action
am:
2ef1aa5894
Change-Id: I08a9f74e7ddb0f72881f82da40d950bf6b63e7d6
TreeHugger Robot [Fri, 9 Sep 2016 01:50:07 +0000 (01:50 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev
Todd Kennedy [Tue, 6 Sep 2016 21:02:38 +0000 (14:02 -0700)]
Direct launch to web action
We want to be able to direct launch into the web action settings
Fixes:
31338071
Change-Id: I295729b8c9e0d3c1196ed820a9e9f6163bf611b4
Salvador Martinez [Wed, 7 Sep 2016 16:17:15 +0000 (16:17 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev am:
20d19a89da
am:
9079070347
Change-Id: Iac8b96ca2fb2dd70a854ba5fd50cf0c390d52176
Salvador Martinez [Wed, 7 Sep 2016 16:17:14 +0000 (16:17 +0000)]
Fixed Sound Settings summary text am:
b706d4e956
am:
d39c1fa395
Change-Id: I73fa598eb0067b5c1497e7bac803b9d349eaf86c
Salvador Martinez [Wed, 7 Sep 2016 16:14:45 +0000 (16:14 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
am:
20d19a89da
Change-Id: Ia991091c2bcb17c61bb0dc0fca44f26995633c69
Salvador Martinez [Wed, 7 Sep 2016 16:14:44 +0000 (16:14 +0000)]
Fixed Sound Settings summary text
am:
b706d4e956
Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb
Salvador Martinez [Wed, 7 Sep 2016 16:06:41 +0000 (16:06 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev
Bill Yi [Wed, 7 Sep 2016 12:06:31 +0000 (12:06 +0000)]
Import translations. DO NOT MERGE am:
596da67f4b -s ours
am:
9f2a012fcf -s ours
Change-Id: Ibc51db1071568435ff4429ee415c56af9d442fc8
Bill Yi [Wed, 7 Sep 2016 12:03:59 +0000 (12:03 +0000)]
Import translations. DO NOT MERGE
am:
596da67f4b -s ours
Change-Id: Id618745ef778ce8c0d49cc2b917322c540f48ce4
Bill Yi [Wed, 7 Sep 2016 10:20:53 +0000 (03:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic79af1cb3c770ec68e0665d9885e8e189497075f
Auto-generated-cl: translation import
Salvador Martinez [Wed, 31 Aug 2016 21:17:35 +0000 (14:17 -0700)]
Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.
Test: make SettingsTests
Bug:
31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
Maurice Lam [Tue, 6 Sep 2016 23:31:17 +0000 (23:31 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af am:
d278da7952 am:
94a0fa5759 am:
746dff40ba -s ours am:
17ec053dd5 am:
27aabcd4df am:
6a51dfdcf3
am:
c74cefce54
Change-Id: I28c75cfcbdccca126d00b01cbfce5caafc20e3e2
Andrew Sapperstein [Tue, 6 Sep 2016 23:31:17 +0000 (23:31 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am:
4e4e4ff19a am:
27af0ed9e2 am:
86a4c442c1
am:
78f98e3b17
Change-Id: I567224dfe3cfe10e898bba20481f0dacbfae1532
Andrew Sapperstein [Tue, 6 Sep 2016 23:31:16 +0000 (23:31 +0000)]
Null check intent before starting "learn more". am:
e56d2be0b2 -s ours am:
aa12cf603b am:
9177b11c8d
am:
b2d898dcad
Change-Id: Iedfccf8cbc5205413b7abe9fbf4ce24df46676d8
Maurice Lam [Tue, 6 Sep 2016 23:28:49 +0000 (23:28 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af am:
d278da7952 am:
94a0fa5759 am:
746dff40ba -s ours am:
17ec053dd5 am:
27aabcd4df
am:
6a51dfdcf3
Change-Id: I18132d9ed3095ac0d18616405d82ecec0e7cc8ae
OSDN Git Service
