OSDN Git Service
Phil Weaver [Mon, 25 Jul 2016 20:23:06 +0000 (20:23 +0000)]
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 18:35:56 +0000 (18:35 +0000)]
Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
Makoto Onuki [Mon, 25 Jul 2016 18:12:00 +0000 (18:12 +0000)]
Merge "Improve string comment" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:46:07 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
Bill Yi [Mon, 25 Jul 2016 14:34:40 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I460a8a0f711298b1658451774c021e8d4a3d2087
Auto-generated-cl: translation import
Fan Zhang [Sat, 23 Jul 2016 00:14:48 +0000 (17:14 -0700)]
Add non-transparent background to dashboard items.
Bug:
30297664
Change-Id: Ia6173e8b0d5852a1c454ae466886f894c72e3e5f
Doris Ling [Fri, 22 Jul 2016 22:14:00 +0000 (22:14 +0000)]
Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add NightDisplaySettingsActivity" into nyc-mr1-dev
Anna Galusza [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev
Doris Ling [Fri, 22 Jul 2016 20:28:21 +0000 (13:28 -0700)]
Fix scroll issue when going from Display->Ambient Display to Moves.
Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.
Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes:
30262357
Anna Galusza [Fri, 15 Jul 2016 00:10:35 +0000 (17:10 -0700)]
Fix font and display size settings pages for small screens.
This was particularly broken in split-screen mode.
Bug:
29835212
Change-Id: I141f659e2d2d282d5af1ae97d6c798e53f71f766
Justin Klaassen [Fri, 22 Jul 2016 02:25:17 +0000 (19:25 -0700)]
Add NightDisplaySettingsActivity
- The Settings#ACTION_NIGHT_DISPLAY_SETTINGS action can be used by apps
to launch Night display settings directly.
Bug:
30291948
Change-Id: I5545bb7f0a467116454e5c44e207cbe91ddf9d43
Fan Zhang [Fri, 22 Jul 2016 17:03:52 +0000 (10:03 -0700)]
Don't allow changing data usage setting if uid is not app.
Bug:
30262890
Changing non-app UID's (eg system, firewalld) data usage will just crash.
Change-Id: I1c3f2504aae75f514f962fd54f4dcf240b3bcd81
Doris Ling [Thu, 21 Jul 2016 20:58:21 +0000 (20:58 +0000)]
Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev
Fan Zhang [Thu, 21 Jul 2016 20:28:19 +0000 (13:28 -0700)]
Fix crash when starting Settings -> Display -> Font size
Change-Id: I26f81d02e31b0b7c8120395231aa6b81be6be7be
Fixes:
30279736
Doris Ling [Thu, 21 Jul 2016 19:22:17 +0000 (12:22 -0700)]
Check for null activity before getting dashboard categories.
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.
Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes:
30278854
Sunny Goyal [Thu, 21 Jul 2016 18:27:33 +0000 (18:27 +0000)]
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
Sunny Goyal [Thu, 21 Jul 2016 00:18:33 +0000 (17:18 -0700)]
Updating the shortcut icons for Settings app
Bug:
30224034
Bug:
30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
Makoto Onuki [Thu, 21 Jul 2016 17:35:47 +0000 (10:35 -0700)]
Improve string comment
Bug
30210359
Bug
30207992
Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
TreeHugger Robot [Thu, 21 Jul 2016 04:32:47 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
* changes:
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
Settings: add logpersist kernel only selection
Settings: add logpersist selection (actions)
Bill Yi [Thu, 21 Jul 2016 03:05:32 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 21 Jul 2016 02:43:37 +0000 (02:43 +0000)]
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 22:46:50 +0000 (15:46 -0700)]
Get gestures animation preview image in async loader.
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug:
29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 01:03:45 +0000 (01:03 +0000)]
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
This reverts commit
f179f845e50837a069383f3b268f643c4d2cfad8.
Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:21 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks instead of hard-coding them"
This reverts commit
ae63c3db14f4ddf89d33df894af53fb066226da3.
Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
Daniel Nishi [Wed, 20 Jul 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev
Daniel Nishi [Tue, 19 Jul 2016 19:41:46 +0000 (12:41 -0700)]
Update the Bluetooth pin pairing view to the new spec.
Bug:
30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
Tony Mak [Wed, 20 Jul 2016 19:20:54 +0000 (19:20 +0000)]
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
Abodunrinwa Toki [Wed, 20 Jul 2016 18:50:15 +0000 (18:50 +0000)]
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
Doris Ling [Wed, 20 Jul 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
Daniel Nishi [Wed, 20 Jul 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Color transforms are now color modes." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 14:34:39 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
Bill Yi [Wed, 20 Jul 2016 14:09:37 +0000 (07:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
Jason Monk [Wed, 20 Jul 2016 13:28:13 +0000 (13:28 +0000)]
Merge "Protect against work conditional crash" into nyc-mr1-dev
Tony Mak [Wed, 20 Jul 2016 08:55:25 +0000 (09:55 +0100)]
Should not report unsuccessful attempt if pattern size < minimal size
It is to align the behavior in personal side lock screen.
Change-Id: I811e72405615fbed85c2a4dc6b6cec51e4ad54f0
Fix:
30215101
TreeHugger Robot [Wed, 20 Jul 2016 01:00:23 +0000 (01:00 +0000)]
Merge "Add Night display settings conditional" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 00:49:37 +0000 (00:49 +0000)]
Merge "Add ripple effect on all preference tiles." into nyc-mr1-dev
Matthew Fritze [Tue, 19 Jul 2016 20:04:17 +0000 (13:04 -0700)]
Error colors to point to frameworks instead of hard-coding them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res/.
Bug:
30021554
Change-Id: I6ec0512c5e69bc822810745b1745fa9feff95150
Fan Zhang [Tue, 19 Jul 2016 23:04:28 +0000 (16:04 -0700)]
Add ripple effect on all preference tiles.
Bug:
30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42
Daniel Nishi [Tue, 19 Jul 2016 22:47:10 +0000 (15:47 -0700)]
Add a help item for the Help & Feedback for the Storage Manager.
Bug:
29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05
Andrew Sapperstein [Tue, 19 Jul 2016 21:42:25 +0000 (21:42 +0000)]
Merge "Fix a bunch of straggler themes." into nyc-mr1-dev
Justin Klaassen [Tue, 19 Jul 2016 04:39:03 +0000 (21:39 -0700)]
Add Night display settings conditional
Bug:
30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
- Deal with trampoline, where we read logd.logpersistd and
logd.logpersistd.buffer, write to persist.logd.logpersistd and
persist.logd.logpersistd.buffer and logd.logpersistd*
- Deal with an as designed requirement that empty values do not
automatically trampoline, to properly communicate state.
- check logd.logpersistd.enable boolean for support
Bug:
28813587
Bug:
28936216
Bug:
29831823
Change-Id: Ib460ca90738ffdee17084349c1035701301c52bc
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: add logpersist kernel only selection
Bug:
28813587
Bug:
28936216
Bug:
29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
Mark Salyzyn [Fri, 3 Jun 2016 17:18:23 +0000 (10:18 -0700)]
Settings: add logpersist selection (actions)
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug:
28813587
Bug:
28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
Jason Monk [Tue, 19 Jul 2016 20:39:18 +0000 (20:39 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am:
5a3d1c17f2
Change-Id: I0bc7e426b0dfc4d233b9caa263e5361f94dbf6f2
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Doris Ling [Tue, 19 Jul 2016 20:30:12 +0000 (20:30 +0000)]
Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:19:04 +0000 (20:19 +0000)]
Merge "Add Gestures settings to search index." into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 19:30:44 +0000 (19:30 +0000)]
Merge "Clarify string translation." into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 18:45:03 +0000 (11:45 -0700)]
Add Gestures settings to search index.
Add GestureSettings class to the resource map of
SearchIndeSearchIndexableResources so that the preferences in the
gestures settings will be indexed and showed up as search result.
Bug:
30169776
Change-Id: I51be9e82dc8bce93e2abd13b48ceb3cd051cbcf4
Jason Monk [Tue, 19 Jul 2016 18:22:14 +0000 (14:22 -0400)]
Protect against work conditional crash
Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes:
30014085
Fan Zhang [Tue, 19 Jul 2016 16:37:47 +0000 (09:37 -0700)]
Clarify string translation.
Bug:
30196308
Clarify ringtong volume string format and add an example.
Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:28:50 +0000 (14:28 +0000)]
Merge "Fix crash from dismissing after pause" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 09:49:06 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Maurice Lam [Tue, 19 Jul 2016 01:30:08 +0000 (01:30 +0000)]
Merge "Lock the orientation for FallbackHome" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 01:05:06 +0000 (18:05 -0700)]
Fix janky scrolling for Gestures Settings.
1. Move the media player initialization/cleanup to construstor and
onDetach() of GesturePreference correspondingly, so that it's only
done once instead of every time when a new texture surface is available.
2. Pause the animation video when user scrolls.
Bug:
29790087
Change-Id: I51e6a787f9f2964b6bfc5288f7f5af801ccecc31
Bill Yi [Mon, 18 Jul 2016 23:43:22 +0000 (16:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I34ef9d17f926e12706029e3825182e6dd0e1c24e
Auto-generated-cl: translation import
Maurice Lam [Mon, 18 Jul 2016 23:24:18 +0000 (23:24 +0000)]
Merge "Support hardware colors for fingerprint video" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Update FakeUid with new methods" into nyc-mr1-dev
Maurice Lam [Fri, 15 Jul 2016 19:33:52 +0000 (12:33 -0700)]
Support hardware colors for fingerprint video
Bug:
28745754
Change-Id: Id86c2a6d882d4c4c4d1981da58de3e4c2059a50c
Christopher Wiley [Mon, 18 Jul 2016 18:16:15 +0000 (11:16 -0700)]
Do not use TetherUtil.setWifiTethering
This functionality is replaced by ConnectivityManager.startTethering()
and ConnectivityManager.stopTethering().
Bug:
30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
and quick quick settings.
Change-Id: I4d190185c473237982b988f898e76d4997dc401c
Andrew Sapperstein [Fri, 15 Jul 2016 23:46:38 +0000 (16:46 -0700)]
Fix a bunch of straggler themes.
They were all stock material themes and are now all using
their DeviceDefault equivalents.
Change-Id: I0013847499c592c801101638168edd7ebf0d721a
Fixes:
30140567
Wonsik Kim [Mon, 18 Jul 2016 15:31:17 +0000 (15:31 +0000)]
Merge "Refine fingerprint animation handling" into nyc-mr1-dev
Abodunrinwa Toki [Mon, 18 Jul 2016 11:03:38 +0000 (12:03 +0100)]
DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.
This ports I1e4035f4dcff33e6b9a42d448303e962bd87c14b to MR1 dev.
Bug:
28182232
Change-Id: I292b00a21eb80577dbfec6a13f57b326571aefc7
Maurice Lam [Sat, 16 Jul 2016 01:11:54 +0000 (18:11 -0700)]
Lock the orientation for FallbackHome
Set FallbackHome's orientation to nosensor in the manifest, so it
will always be shown in the natural device orientation.
Bug:
30040032
Change-Id: I875fa6d112db23273026dbc39b5d32748d7e99f1
Adam Lesinski [Sat, 16 Jul 2016 01:08:29 +0000 (18:08 -0700)]
Update FakeUid with new methods
Bug:
28931278
Change-Id: I845337633b1840ae66bda065985624aa67b070df
Fan Zhang [Fri, 15 Jul 2016 20:12:13 +0000 (13:12 -0700)]
Let talkback announce category name in Settings.
Bug:
30082459
Change-Id: Id88e5b6d361ebc6863a30a765323a74345657c39
Doris Ling [Fri, 15 Jul 2016 18:18:23 +0000 (11:18 -0700)]
Combine setCategories() and setSuggestions() in DashboardAdapter.
In DashboardSummary.rebuildUI(), we first update the adapter with the
current categories, then run the async task to update the adapter with
the suggestions. This causes the adapter to first layout the existing
categories, and relayout when the suggestions is available. This causes
the suggestions view and categories view to overlap before the
relayout is complete.
Since categories and suggestions are borh set each time we try to
rebuild the UI, delaying the update for categories until the suggestions
are ready will avoid the unnecessary relayout of the list elements.
Ran app launch test for Settings app with the change and launch time is
between 412ms and 486ms in 10 runs, which does not show much delay in
app launch time with delaying updating the categories.
Bug:
29318104
Change-Id: I03ae2386392315f28fe2c361682f2f3252e9f827
Phil Weaver [Fri, 15 Jul 2016 19:54:45 +0000 (12:54 -0700)]
Fix return when virtual keyboard setting changes.
The OnPreferenceChangeListener for the preference to show
the virtual keyboard was returning false, indicating that the
new preference was not to be persisted, even though it was
persisting the setting. That caused the accessibility
framework not to be informed of the new value, which led
TalkBack to speak the old value rather than the new one.
Bug:
30140972
Change-Id: I02b7dc1db52cb7646650e6f2e49a1e15c2233897
Matthew Fritze [Fri, 15 Jul 2016 19:06:47 +0000 (19:06 +0000)]
Merge "Settings ViewPager now correctly handles RTL mode" into nyc-mr1-dev
Matthew Fritze [Thu, 14 Jul 2016 19:57:04 +0000 (12:57 -0700)]
Settings ViewPager now correctly handles RTL mode
Previously, the settings and support tabs were incorrectly orderded,
and had inverted transitions on click and on swipe.
Ordering of tabs now correctly displays All Settings as the default,
right tab, and the Support tab to its left. The tab headers also now
function properly in transition, and onclick.
Change-Id: Iab499ee13433cb78941bc33cbb0e99ffe2937174
Fixes:
30079049
TreeHugger Robot [Fri, 15 Jul 2016 18:17:54 +0000 (18:17 +0000)]
Merge "Fix up for forget storage screen" into nyc-mr1-dev
Fyodor Kupolov [Thu, 14 Jul 2016 01:11:59 +0000 (18:11 -0700)]
Application names are now lazily loaded
Previously when SmsApplication.getDefaultApplication was called, application
names were loaded for all candidate apps. The problem with that approach
that names are expensive to load and not always needed.
The implementation has been changed to only load application name when
it's requested by getApplicationName(Context).
Bug:
26237300
Change-Id: Ia711b7db8b979af8f7a1be7eefbce20f3e0ab1df
Jason Monk [Fri, 15 Jul 2016 17:18:48 +0000 (13:18 -0400)]
Fix crash from dismissing after pause
Change-Id: Ic9f655bff5aec5678d975389bc1f391b8d608099
Fixes:
29977187
Jason Monk [Fri, 15 Jul 2016 16:58:55 +0000 (12:58 -0400)]
Fix up for forget storage screen
Change-Id: Iaed41e2df377f1e2cb3026e2bdb69f29f9c2be5b
Fixes:
29904366
Jason Monk [Fri, 15 Jul 2016 16:55:14 +0000 (16:55 +0000)]
Merge "Make sure to clear out preference cache when done" into nyc-mr1-dev
Esteban Talavera [Fri, 15 Jul 2016 16:14:20 +0000 (16:14 +0000)]
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 14:11:30 +0000 (14:11 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf am:
68d53c0481 am:
e67f458667 -s ours
am:
2703570242
Change-Id: I0e3964b7a1b7398ae96a798de892a40d05be0add
Jason Monk [Fri, 15 Jul 2016 14:08:40 +0000 (14:08 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf am:
68d53c0481
am:
e67f458667 -s ours
Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1
Jason Monk [Fri, 15 Jul 2016 14:05:59 +0000 (14:05 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf
am:
68d53c0481
Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am:
e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
Tony Mak [Fri, 15 Jul 2016 03:42:07 +0000 (03:42 +0000)]
Merge "Disable instead of hiding add account preference" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 20:14:21 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 13:49:58 +0000 (13:49 +0000)]
Merge "Open Security Patch Bulletin" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 07:32:26 +0000 (15:32 +0800)]
Disallow user to block notification from OobConfig
Change-Id: I4680e5c5b596e81ac33d544d0d81de9df3b7587c
Fix:
29632126
Bill Yi [Thu, 14 Jul 2016 06:07:59 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9230fd1dacce710c8cb39946a65ed3550b6d2e0a
Auto-generated-cl: translation import
Tony Mak [Thu, 14 Jul 2016 05:42:50 +0000 (13:42 +0800)]
Disable instead of hiding add account preference
Bug:
29236399
Change-Id: Ieb1af7f31a54b1502ae99682fc423e37c86a2353
Michael Wright [Thu, 14 Jul 2016 05:11:09 +0000 (22:11 -0700)]
Color transforms are now color modes.
We've also standardized on a specific, enumerated set of modes, which
simplifies the code a bit.
Bug:
29044347
Change-Id: I621352954d42ad25f9969b7a88d53defe84dd3b4
Jeff Sharkey [Thu, 14 Jul 2016 04:31:35 +0000 (04:31 +0000)]
Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
Jeff Sharkey [Wed, 13 Jul 2016 22:41:59 +0000 (16:41 -0600)]
Preemptively add string for direct boot dialogs.
Bug:
27196876
Change-Id: Ieb65b4b7b4e075c1de2e502d0272f8f113c1c34b