OSDN Git Service
Philip P. Moltmann [Wed, 14 Sep 2016 20:31:26 +0000 (13:31 -0700)]
USB restriction is similar to media restriction
Bug:
31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
Matthew Fritze [Wed, 14 Sep 2016 16:30:01 +0000 (09:30 -0700)]
resolve merge conflicts of
a04bf12 to master
Change-Id: Ie8b93666d98832af510e76ec50af964e2460743b
Matthew Fritze [Wed, 14 Sep 2016 02:08:11 +0000 (19:08 -0700)]
resolve merge conflicts of
e6431c7 to master
Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
Matthew Fritze [Wed, 14 Sep 2016 00:41:54 +0000 (00:41 +0000)]
Merge "Revert "Linked google truth to Robolectric tests and added an example.""
Matthew Fritze [Wed, 14 Sep 2016 00:33:31 +0000 (00:33 +0000)]
Revert "Linked google truth to Robolectric tests and added an example."
This reverts commit
21f15a3280b698c99f31ca9860dfc4f741f8a478.
Change-Id: I07b978438b09c1a905eb58d2198913d21d552d6d
Matthew Fritze [Wed, 14 Sep 2016 00:07:47 +0000 (00:07 +0000)]
Merge "Linked google truth to Robolectric tests and added an example."
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: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, 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
Felipe Leme [Tue, 13 Sep 2016 21:35:34 +0000 (21:35 +0000)]
Merge "Improved storage accounting:" into nyc-mr1-dev am:
96c128cc99 am:
bd91315654
am:
19591904c6
Change-Id: Ibde5edf7d3678bab4083f6f6ae1dfb3b61e8e88a
Felipe Leme [Tue, 13 Sep 2016 21:35:33 +0000 (21:35 +0000)]
Improved storage accounting: am:
7358b7802f am:
49260969b7
am:
1469dde1a0
Change-Id: I2cb0e03aab3c79bde080ea3b73a1ad31c72d5cfa
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
Fan Zhang [Thu, 25 Aug 2016 00:03:11 +0000 (17:03 -0700)]
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
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
Matthew Fritze [Fri, 2 Sep 2016 00:26:41 +0000 (17:26 -0700)]
Linked google truth to Robolectric tests and added an example.
Bug:
31252617
Change-Id: I95aefd4809b8d292fe4cbeac903b8445e6e2a5ea
Test: Target: RunSettingsRoboTests
Bill Yi [Tue, 13 Sep 2016 09:46:43 +0000 (09:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9b5a8224e8 -s ours am:
507f18c577 -s ours
am:
546d9d139c -s ours
Change-Id: If5222cabafb0f6e0df7fe810e9ac489bb7a78d26
Bill Yi [Tue, 13 Sep 2016 09:46:42 +0000 (09:46 +0000)]
Import translations. DO NOT MERGE am:
44f9a3fd1e -s ours am:
3978b56311 -s ours
am:
69eb2d9088 -s ours
Change-Id: I201f4771196e290eb2cebbd29b23e8e4fa6f8215
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:56:15 +0000 (04:56 +0000)]
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev am:
d8a275a1d2 am:
acb9809e09
am:
440a790c88
Change-Id: I40f19f20b9578d04db50b311689dd0509a1f225d
Justin Klaassen [Tue, 13 Sep 2016 04:56:14 +0000 (04:56 +0000)]
Disable NightDisplaySettingsActivity when not available am:
e1a16c4f3e am:
b606c9ca78
am:
2369ded79d
Change-Id: I83c77635b19088c8c0a09a9c0782b9f022c128f9
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 02:10:11 +0000 (02:10 +0000)]
Merge "Make a11y settings display consistent" into nyc-mr1-dev am:
9d6bce3667 am:
db54ab8193
am:
c2be318cdf
Change-Id: Ie201e996b4985e0e59672adb0b5411235e3e5a2a
Phil Weaver [Tue, 13 Sep 2016 02:10:10 +0000 (02:10 +0000)]
Make a11y settings display consistent am:
99a66b5416 am:
17fb0f6cf5
am:
02b9cb27bb
Change-Id: I9a6c530e5fbb7bf2023b0f84186b568c47e694f3
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 22:00:00 +0000 (22:00 +0000)]
Update Night Light summary strings am:
ed765a4817 am:
82926aebdf
am:
aaf0bc56ab
Change-Id: I25da4ef00be6a5e9651073572ae51b6f2884f669
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
Daniel Nishi [Mon, 12 Sep 2016 18:18:51 +0000 (18:18 +0000)]
Merge "Fix the Settings lifecycle Robotests."
TreeHugger Robot [Mon, 12 Sep 2016 09:08:05 +0000 (09:08 +0000)]
Merge "Eliminate useless 'isManagedProfile' utils method"
Robin Lee [Mon, 12 Sep 2016 07:25:28 +0000 (16:25 +0900)]
Eliminate useless 'isManagedProfile' utils method
This exists in UserManager now
Change-Id: If35326a1fe0de3c7bfde842c5c170899dc5d819b
Fyodor Kupolov [Sat, 10 Sep 2016 00:14:29 +0000 (00:14 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev am:
4b60607038 am:
0ec8187b46
am:
fc50f21a5a
Change-Id: I7f7bbde4a4fc3250ac3d849b17019032b4dd1cb8
Fyodor Kupolov [Sat, 10 Sep 2016 00:14:28 +0000 (00:14 +0000)]
Ignore onPreferenceChange for top level preference am:
bf88b269ca am:
26a0f7037a
am:
07f4c033fd
Change-Id: I665d08af5fd4d6e0634c9889dbb3abfef7105fd7
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
Daniel Nishi [Fri, 9 Sep 2016 20:33:39 +0000 (13:33 -0700)]
Fix the Settings lifecycle Robotests.
By breaking the tests into two pieces, we avoid any race conditions
with adding the fragment and also unit test the two components
separately.
Bug:
31370315
Test: m RunSettingsRoboTests
Change-Id: I9761b0b00141d3ce481a7edb5d8145c645c51da7
Jim Miller [Fri, 9 Sep 2016 20:32:31 +0000 (20:32 +0000)]
Merge "Check for missing preference before setting title." into nyc-mr1-dev am:
ca9a78f2d1 am:
cfc960df98
am:
018e75781c
Change-Id: I82d2e8c4143d7dce295cd5faede9e53e9fa10ba5
Jim Miller [Fri, 9 Sep 2016 20:32:31 +0000 (20:32 +0000)]
Check for missing preference before setting title. am:
06458be226 am:
68306c3409
am:
3d0b4bb6c9
Change-Id: I75dc4b7f832884fa4a6eb9f5e934d1da36d303f0
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:13:13 +0000 (02:13 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev am:
e162563e10 am:
26c4f2b42e
am:
e02dfb9d00
Change-Id: Id5c4e65c6cd9b1b057608110e5efa78c1d0eb2a4
Todd Kennedy [Fri, 9 Sep 2016 02:13:11 +0000 (02:13 +0000)]
Direct launch to web action am:
2ef1aa5894 am:
de2da206af
am:
4de8f3f6bb
Change-Id: I7129d3252f652a4e9fb410229cbfd9c1a7099289
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 18:08:14 +0000 (18:08 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev am:
20d19a89da am:
9079070347
am:
cc4d17cedf
Change-Id: Ib32e01796a41b54e664cf97aea45cf5e28748e9d
Salvador Martinez [Wed, 7 Sep 2016 18:02:11 +0000 (18:02 +0000)]
Merge "resolve merge conflicts of
8ec7028 to master"
TreeHugger Robot [Wed, 7 Sep 2016 17:42:24 +0000 (17:42 +0000)]
Merge "Replaced deprecated calls to INetworkPolicyListener."
Salvador Martinez [Wed, 7 Sep 2016 17:24:03 +0000 (10:24 -0700)]
resolve merge conflicts of
8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
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:08:33 +0000 (12:08 +0000)]
Import translations. DO NOT MERGE am:
596da67f4b -s ours am:
9f2a012fcf -s ours
am:
d8919ba359 -s ours
Change-Id: I6187f3016dec9f37ff3b9c0bc4707a2dc38f9e70
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:55:46 +0000 (23:55 +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
am:
c122156212 -s ours
Change-Id: I5814c785cb177173a8fb7027a409442e68d465df
Andrew Sapperstein [Tue, 6 Sep 2016 23:55:45 +0000 (23:55 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am:
4e4e4ff19a am:
27af0ed9e2 am:
86a4c442c1 am:
78f98e3b17
am:
72c253f2b4
Change-Id: I10c47b22778cd427d3ad6e9d6d4899475a2d7371
Andrew Sapperstein [Tue, 6 Sep 2016 23:55:44 +0000 (23:55 +0000)]
Null check intent before starting "learn more". am:
e56d2be0b2 -s ours am:
aa12cf603b am:
9177b11c8d am:
b2d898dcad
am:
a26f0befd9
Change-Id: I87b0d27f33878d32ad68853291f5102faf248fdb
Maurice Lam [Tue, 6 Sep 2016 23:54:14 +0000 (23:54 +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:
c38b6a12cb
am:
79b1cf5efd -s ours
Change-Id: If35b5b461cd57410fe72d448c565feb3c908a2fb
Andrew Sapperstein [Tue, 6 Sep 2016 23:54:13 +0000 (23:54 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am:
4e4e4ff19a am:
c16c5ded7b
am:
4ff0fd3c5c
Change-Id: I90f36d3b12c7f1ecd3bbae287f236a12448aad20
Andrew Sapperstein [Tue, 6 Sep 2016 23:54:12 +0000 (23:54 +0000)]
Null check intent before starting "learn more". am:
e56d2be0b2 am:
1d20e81742 -s ours
am:
c09ea209da
Change-Id: I2f6a86b6f12d0ef276440c73b1d2181c6b2873bc
Maurice Lam [Tue, 6 Sep 2016 23:54:11 +0000 (23:54 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am:
d0a95da564 am:
595cae7039
am:
81ba97c7db -s ours
Change-Id: Iedf1f6c8859117d84336d93bf3c49a73245065db
Maurice Lam [Tue, 6 Sep 2016 23:54:10 +0000 (23:54 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am:
d0a95da564 -s ours am:
534fa13894 am:
9e081e0db8 am:
39390c9527
am:
5cd7289ae8 -s ours
Change-Id: I3210abf9a84ff7699390d46a54f2bd4bd75341ae
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
OSDN Git Service
