OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Add string for set data warning." into nyc-mr1-dev
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

7 years agoAdd string for set data warning.
Fan Zhang [Tue, 13 Sep 2016 23:22:10 +0000 (23:22 +0000)]
Add string for set data warning.
am: d10686ff4f

Change-Id: I6b923a13339955e8c5a22da4258390e0a85ad2b5

7 years agoMerge "Add string for set data warning." into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 23:19:45 +0000 (23:19 +0000)]
Merge "Add string for set data warning." into nyc-mr1-dev

7 years agoMerge changes Ida1281a7,I70398d46 into nyc-mr1-dev
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

7 years agoPrevent Data Usage Settings crash on phones without cellular history
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

7 years agoData Usage summary creates a dialog to change data warning level
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

7 years agoMerge changes Ida1281a7,I70398d46 into nyc-mr1-dev
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

7 years agoPrevent Data Usage Settings crash on phones without cellular history
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

7 years agoAdd string for set data warning.
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

7 years agoData Usage summary creates a dialog to change data warning level
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)

7 years agoMerge "Improved storage accounting:" into nyc-mr1-dev
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

7 years agoImproved storage accounting:
Felipe Leme [Tue, 13 Sep 2016 19:44:54 +0000 (19:44 +0000)]
Improved storage accounting:
am: 7358b7802f

Change-Id: Ie5839177bf44a0269e04d17a2f33012e3029ab38

7 years agoMerge "Improved storage accounting:" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 19:39:22 +0000 (19:39 +0000)]
Merge "Improved storage accounting:" into nyc-mr1-dev

7 years agoImproved storage accounting:
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 08:27:58 +0000 (08:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
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

7 years agoDisable NightDisplaySettingsActivity when not available
Justin Klaassen [Tue, 13 Sep 2016 04:00:53 +0000 (04:00 +0000)]
Disable NightDisplaySettingsActivity when not available
am: e1a16c4f3e

Change-Id: I3c2bf9f76177af40bf0f2025978c7c9f34181004

7 years agoMerge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
TreeHugger Robot [Tue, 13 Sep 2016 03:51:07 +0000 (03:51 +0000)]
Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev

7 years agoMerge "Make a11y settings display consistent" into nyc-mr1-dev
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

7 years agoMake a11y settings display consistent
Phil Weaver [Tue, 13 Sep 2016 01:13:41 +0000 (01:13 +0000)]
Make a11y settings display consistent
am: 99a66b5416

Change-Id: Ic62d9ac58ebab8e52d9bb22c7c377d640fc027bb

7 years agoMerge "Make a11y settings display consistent" into nyc-mr1-dev
Phil Weaver [Tue, 13 Sep 2016 01:07:05 +0000 (01:07 +0000)]
Merge "Make a11y settings display consistent" into nyc-mr1-dev

7 years agoDisable NightDisplaySettingsActivity when not available
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

7 years agoMake a11y settings display consistent
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

7 years agoUpdate Night Light summary strings
Justin Klaassen [Mon, 12 Sep 2016 21:00:57 +0000 (21:00 +0000)]
Update Night Light summary strings
am: ed765a4817

Change-Id: Ie21298848c8d9b80a96f2dd90c84bee6eeee8c6b

7 years agoUpdate Night Light summary strings
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

7 years agoMerge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
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

7 years agoIgnore onPreferenceChange for top level preference
Fyodor Kupolov [Fri, 9 Sep 2016 23:46:49 +0000 (23:46 +0000)]
Ignore onPreferenceChange for top level preference
am: bf88b269ca

Change-Id: Ib5208cb8b7d1a0bbaeed4ddbdbf6c15bce8b1b49

7 years agoMerge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev
Fyodor Kupolov [Fri, 9 Sep 2016 23:30:35 +0000 (23:30 +0000)]
Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev

7 years agoMerge "Check for missing preference before setting title." into nyc-mr1-dev
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

7 years agoCheck for missing preference before setting title.
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

7 years agoMerge "Check for missing preference before setting title." into nyc-mr1-dev
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

7 years agoCheck for missing preference before setting title.
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

7 years agoMerge "Direct launch to web action" into nyc-mr1-dev
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

7 years agoDirect launch to web action
Todd Kennedy [Fri, 9 Sep 2016 01:59:32 +0000 (01:59 +0000)]
Direct launch to web action
am: 2ef1aa5894

Change-Id: I08a9f74e7ddb0f72881f82da40d950bf6b63e7d6

7 years agoMerge "Direct launch to web action" into nyc-mr1-dev
TreeHugger Robot [Fri, 9 Sep 2016 01:50:07 +0000 (01:50 +0000)]
Merge "Direct launch to web action" into nyc-mr1-dev

7 years agoDirect launch to web action
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

7 years agoMerge "Fixed Sound Settings summary text" into nyc-mr1-dev
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

7 years agoFixed Sound Settings summary text
Salvador Martinez [Wed, 7 Sep 2016 16:14:44 +0000 (16:14 +0000)]
Fixed Sound Settings summary text
am: b706d4e956

Change-Id: I6161e1ffbec8e17591240a0a16801afdae113fbb

7 years agoMerge "Fixed Sound Settings summary text" into nyc-mr1-dev
Salvador Martinez [Wed, 7 Sep 2016 16:06:41 +0000 (16:06 +0000)]
Merge "Fixed Sound Settings summary text" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoFixed Sound Settings summary text
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

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
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

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a...
Andrew Sapperstein [Tue, 6 Sep 2016 23:28:48 +0000 (23:28 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a am: 27af0ed9e2
am: 86a4c442c1

Change-Id: I77b905b00bdf012707444187d7185a77cb6d5920

7 years agoNull check intent before starting "learn more". am: e56d2be0b2 -s ours am: aa12cf603b
Andrew Sapperstein [Tue, 6 Sep 2016 23:28:47 +0000 (23:28 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2  -s ours am: aa12cf603b
am: 9177b11c8d

Change-Id: I98af020a3759adaa9028ccea60eed1c552ab4339

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:23:49 +0000 (23:23 +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

Change-Id: I1be1f917392a5102e9f7c5178ef9316aadd29ad2

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
Andrew Sapperstein [Tue, 6 Sep 2016 23:23:48 +0000 (23:23 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev am: 4e4e4ff19a
am: 27af0ed9e2

Change-Id: I701957dceecec49950ffab22ab6ca38f204d687e

7 years agoNull check intent before starting "learn more". am: e56d2be0b2 -s ours
Andrew Sapperstein [Tue, 6 Sep 2016 23:23:47 +0000 (23:23 +0000)]
Null check intent before starting "learn more". am: e56d2be0b2  -s ours
am: aa12cf603b

Change-Id: Ie9389929ab179aafd2066db6483ba2cebf5563ee

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:22:52 +0000 (23:22 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759 am: 746dff40ba  -s ours
am: 17ec053dd5

Change-Id: I11ea83d07eebfb55b8f1fbd0f431120c791314b1

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
Andrew Sapperstein [Tue, 6 Sep 2016 23:22:50 +0000 (23:22 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev
am: 4e4e4ff19a

Change-Id: Ia2a0fec158a49c723cc3923baafa024aa3570c0b

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s...
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564  -s ours am: 534fa13894
am: 9e081e0db8

Change-Id: I84fb88a14e3c15e00a0caade542a2c0ea4902777

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759
am: 746dff40ba  -s ours

Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 6 Sep 2016 23:18:45 +0000 (23:18 +0000)]
Null check intent before starting "learn more".
am: e56d2be0b2  -s ours

Change-Id: Ia53a28a35679db7d25c15c9cc9b862da7065f68a

7 years agoRemove help links when device is not provisioned. DO NOT MERGE am: d0a95da564 -s...
Maurice Lam [Tue, 6 Sep 2016 23:16:47 +0000 (23:16 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE am: d0a95da564  -s ours
am: 534fa13894

Change-Id: I6c98994b9b7629f38e7f718a8e559456ea97443c

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:14:25 +0000 (23:14 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952
am: 94a0fa5759

Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:14:15 +0000 (23:14 +0000)]
Remove help links when device is not provisioned. DO NOT MERGE
am: d0a95da564  -s ours

Change-Id: Ib1a0d40efcd380ea6dc3a959770a3ce1b4e6114f

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
am: d278da7952

Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am: c94f2b93af

Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
TreeHugger Robot [Tue, 6 Sep 2016 23:07:26 +0000 (23:07 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 00:10:59 +0000 (17:10 -0700)]
Remove help links when device is not provisioned. DO NOT MERGE

Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".

It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

BUG: 28381984
Fixes: 31246856
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
(cherry picked from commit 6561d4870f031395316cf2fc956f69c306f04ae4)

7 years agoMerge "Prompt to turn on/unlock profile before showing account sync settings" into...
Rubin Xu [Thu, 1 Sep 2016 10:48:47 +0000 (10:48 +0000)]
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev
am: 95089be460

Change-Id: I9455961b5743f4042f3984d4b868194baeca60b3

7 years agoPrompt to turn on/unlock profile before showing account sync settings
Rubin Xu [Thu, 1 Sep 2016 10:48:46 +0000 (10:48 +0000)]
Prompt to turn on/unlock profile before showing account sync settings
am: 3231afe95b

Change-Id: I4385b5c3d478028a5eabecfe23b073633e27e287

7 years agoMerge "Prompt to turn on/unlock profile before showing account sync settings" into...
Rubin Xu [Thu, 1 Sep 2016 10:41:29 +0000 (10:41 +0000)]
Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 1 Sep 2016 06:45:28 +0000 (06:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6030f64a58  -s ours

Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Sep 2016 06:45:27 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE
am: 3afce04bf8  -s ours

Change-Id: Ieacfa08b8f57ca01709324331f52b74c3cb80dfc

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 1 Sep 2016 06:36:19 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Sep 2016 04:56:25 +0000 (21:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I97dae1e7f6b416d7a676e9c2c76942f6ada9582a
Auto-generated-cl: translation import

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
Doris Ling [Thu, 1 Sep 2016 00:05:04 +0000 (00:05 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93 am: 7a15f88912
am: e972a23faf

Change-Id: I60efde4b22dad901c491dc4ce7585c698047420b

7 years agoFix NullPointerException when refreshing wifi preferences. am: b8011dbb93
Doris Ling [Thu, 1 Sep 2016 00:02:02 +0000 (00:02 +0000)]
Fix NullPointerException when refreshing wifi preferences. am: b8011dbb93
am: 7a15f88912

Change-Id: I3b04d4d87063f928fa76b4843ca0692c8d0311cb

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Wed, 31 Aug 2016 23:59:08 +0000 (23:59 +0000)]
Fix NullPointerException when refreshing wifi preferences.
am: b8011dbb93

Change-Id: Ib77f937b79813351594037eaa424fac33995f336

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Wed, 31 Aug 2016 21:27:19 +0000 (14:27 -0700)]
Fix NullPointerException when refreshing wifi preferences.

AccessPointPreference.refresh() is being called in different threads.
The refresh of the preference should only be updated in the main thread.
When access point updates is received not in the main thread, will post
the refreshing of the preference to the message queue to make the update
on the UI thread.

Test: auto - run monkey to verify there is no ANR or crash
      manual - go to Settings->Wifi, toggle on/off many times and verify
      there is no crash.

Change-Id: I656a70ecf2e7b9446c7b95b6b42ab19a5cc2e51c
Fixes: 30902893

7 years agoMerge "Make sure setting switch bar state is announced." into nyc-mr1-dev
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev
am: e954b992d8

Change-Id: Ib39605af8243f105c94909cf0b1aa5c3680250a0

7 years agoMake sure setting switch bar state is announced.
Phil Weaver [Wed, 31 Aug 2016 21:34:53 +0000 (21:34 +0000)]
Make sure setting switch bar state is announced.
am: 664f6dacca

Change-Id: I8ecc83b5affa7af17071971abee57320d1fe2333

7 years agoMerge "Make sure setting switch bar state is announced." into nyc-mr1-dev
Phil Weaver [Wed, 31 Aug 2016 21:32:07 +0000 (21:32 +0000)]
Merge "Make sure setting switch bar state is announced." into nyc-mr1-dev

7 years agoMerge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
am: 3756593811

Change-Id: Iaa61a5d18148e721987df8fb1d76745b315daa85

7 years agoTetherSettings: check provisionApp array length
Rebecca Silberstein [Wed, 31 Aug 2016 20:45:21 +0000 (20:45 +0000)]
TetherSettings: check provisionApp array length
am: 39f0e41ec7

Change-Id: I25e14b85e810e9423e8c89d8449e2826acb77e74

7 years agoMerge "TetherSettings: check provisionApp array length" into nyc-mr1-dev
Rebecca Silberstein [Wed, 31 Aug 2016 20:28:56 +0000 (20:28 +0000)]
Merge "TetherSettings: check provisionApp array length" into nyc-mr1-dev

7 years agoMerge "Implement Web Action settings" into nyc-mr1-dev
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev
am: 1721e4510f

Change-Id: Ib0e0a234b0dcc3fbd6a3602977d744629b31a0ca

7 years agoImplement Web Action settings
Todd Kennedy [Wed, 31 Aug 2016 02:25:37 +0000 (02:25 +0000)]
Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5

7 years agoMerge "Implement Web Action settings" into nyc-mr1-dev
TreeHugger Robot [Wed, 31 Aug 2016 02:20:47 +0000 (02:20 +0000)]
Merge "Implement Web Action settings" into nyc-mr1-dev

7 years agoMerge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
Salvador Martinez [Wed, 31 Aug 2016 00:43:06 +0000 (00:43 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
am: adfcb15518

Change-Id: I968eb6945d2c276f6b7590125b50c7d48671798c

7 years agoCan restore state on rotate personal dict screen
Salvador Martinez [Wed, 31 Aug 2016 00:43:06 +0000 (00:43 +0000)]
Can restore state on rotate personal dict screen
am: 8f4eb4d74b

Change-Id: I8e4a2a29474784e60eb41b356cac65fe5b86886c

7 years agoMerge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
Salvador Martinez [Wed, 31 Aug 2016 00:38:15 +0000 (00:38 +0000)]
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev

7 years agoMerge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
Andrew Sapperstein [Wed, 31 Aug 2016 00:34:45 +0000 (00:34 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
am: 65a8409ddc

Change-Id: I11631880866d49e4a69869b375779aab2c472f68

7 years agoUse LinkTextView for support disclaimer text. am: 7e9146950d
Andrew Sapperstein [Wed, 31 Aug 2016 00:34:45 +0000 (00:34 +0000)]
Use LinkTextView for support disclaimer text. am: 7e9146950d
am: d63e187b1a

Change-Id: Iffd7cc56eb9ee612b8c86a668f4851f229b746ac

7 years agoMerge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
Andrew Sapperstein [Wed, 31 Aug 2016 00:28:27 +0000 (00:28 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
am: a200918af0

Change-Id: I7554d650756aad063d8cf091022fb2a04f823b81

7 years agoUse LinkTextView for support disclaimer text.
Andrew Sapperstein [Wed, 31 Aug 2016 00:28:27 +0000 (00:28 +0000)]
Use LinkTextView for support disclaimer text.
am: 7e9146950d

Change-Id: Ia4a998039bfcdea3419a512d342665248f0b7ac3

7 years agoMerge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
Andrew Sapperstein [Wed, 31 Aug 2016 00:21:29 +0000 (00:21 +0000)]
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev

7 years agoMake sure setting switch bar state is announced.
Phil Weaver [Tue, 30 Aug 2016 23:34:38 +0000 (16:34 -0700)]
Make sure setting switch bar state is announced.

When the switch is clicked, a TYPE_VIEW_CLICKED a11y
event is produced. It works fine if the switch bar is
clicked, but if the switch itself is clicked the event
comes from the switch, which is marked as not important
for accessibility. Re-dispatching events from the switch
as coming from the switch bar makes sure that the event
comes from a view that accessibility services can see.

Bug: 30484493
Change-Id: Ie48cc78594c64b1cc5735475e1cb5959fadaaf4a

7 years agoMerge "Only display System section for current user." into nyc-mr1-dev
Felipe Leme [Tue, 30 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev
am: c24a46128a

Change-Id: I6fe2bf073e3511c94a1c8f64cea28fa512aaa195

7 years agoOnly display System section for current user.
Felipe Leme [Tue, 30 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Only display System section for current user.
am: ce37ef51aa

Change-Id: I6f0aa56dc8ec2c10687bea442c53db1f53242f7b

7 years agoMerge "Only display System section for current user." into nyc-mr1-dev
TreeHugger Robot [Tue, 30 Aug 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Only display System section for current user." into nyc-mr1-dev

7 years agoRemove preference "Searching for Wi-Fi networks..." am: b8e8485720 am: ba7e57ec06
Doris Ling [Tue, 30 Aug 2016 20:16:11 +0000 (20:16 +0000)]
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720 am: ba7e57ec06
am: dc8a2d2b36

Change-Id: I276e37f4a49de53e996db168b022c45f18f33cea

7 years agoRemove preference "Searching for Wi-Fi networks..." am: b8e8485720
Doris Ling [Tue, 30 Aug 2016 20:07:38 +0000 (20:07 +0000)]
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
am: ba7e57ec06

Change-Id: Ic2e0b0c977cf11dcca4ed87deeb8bc6fe9a27420

7 years agoRemove preference "Searching for Wi-Fi networks..."
Doris Ling [Tue, 30 Aug 2016 20:05:09 +0000 (20:05 +0000)]
Remove preference "Searching for Wi-Fi networks..."
am: b8e8485720

Change-Id: Ie264fbdddf2aff8b8f5f4d6aac2fc079b98c9747