OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
Jason Monk [Tue, 19 Jul 2016 20:54:06 +0000 (20:54 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
am: 3b0bfee337

Change-Id: I590a980c4b747d02a7c97768784e7045aea2964f

8 years agoMerge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
Jason Monk [Tue, 19 Jul 2016 20:47:46 +0000 (20:47 +0000)]
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
am: 69ce586155

Change-Id: I5e57fd8016f45d2bb863896aeee34c8786cf41f0

8 years agoMerge \"Pre-setup restrictions\" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:40:35 +0000 (20:40 +0000)]
Merge \"Pre-setup restrictions\" into nyc-dev
am: 5a3d1c17f2

Change-Id: I58796967153f15fad0ba853fa428b191ecc08ed2

8 years agoMerge \"Pre-setup restrictions\" into nyc-dev
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

8 years agoMerge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:35:42 +0000 (20:35 +0000)]
Merge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
am: c2733db43f

Change-Id: I78b884c04ec6fa05fe7a6068260331d8451181cf

8 years agoMerge "Pre-setup restrictions" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev

8 years agoMerge "Fix janky scrolling for Gestures Settings." into nyc-mr1-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

8 years agoMerge \"Add Gestures settings to search index.\" into nyc-mr1-dev
Doris Ling [Tue, 19 Jul 2016 20:21:45 +0000 (20:21 +0000)]
Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev
am: bd3ac3bf22

Change-Id: I0d7aa14a24f496aba842d5b70176bc6f44c49c3b

8 years agoMerge "Add Gestures settings to search index." 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

8 years agoMerge \"Clarify string translation.\" into nyc-mr1-dev
Fan Zhang [Tue, 19 Jul 2016 19:35:06 +0000 (19:35 +0000)]
Merge \"Clarify string translation.\" into nyc-mr1-dev
am: 677cf28f6d

Change-Id: I8513be5787aeae513d44c17221f4b40beb15f92a

8 years agoMerge "Clarify string translation." 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

8 years agoAdd Gestures settings to search index.
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

8 years agoClarify string translation.
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

8 years agoMerge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
Christopher Wiley [Tue, 19 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
am: 62edbf484e

Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4

8 years agoMerge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev

8 years agoMerge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:33:16 +0000 (14:33 +0000)]
Merge \"Fix crash from dismissing after pause\" into nyc-mr1-dev
am: 8cb8dd05a2

Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79

8 years agoMerge "Fix crash from dismissing after pause" 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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Tue, 19 Jul 2016 09:56:23 +0000 (09:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: b2f60d2974  -s ours

Change-Id: Ib24f1486b64a2aa2588e0142ae671d3ba79c8232

8 years agoMerge "Import translations. DO NOT MERGE" 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

8 years agoMerge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
Maurice Lam [Tue, 19 Jul 2016 01:47:34 +0000 (01:47 +0000)]
Merge \"Lock the orientation for FallbackHome\" into nyc-mr1-dev
am: 78626fadb4

Change-Id: Ic15676a02afb4c4acf1eacc3975415108ef2b99c

8 years agoMerge "Lock the orientation for FallbackHome" 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

8 years agoFix janky scrolling for Gestures Settings.
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

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

8 years agoMerge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev
Maurice Lam [Mon, 18 Jul 2016 23:36:15 +0000 (23:36 +0000)]
Merge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev
am: ebd722ce5b

Change-Id: Ibe34d29438026e2e5bfd233e9a245025a9e66931

8 years agoMerge "Support hardware colors for fingerprint video" into nyc-mr1-dev
Maurice Lam [Mon, 18 Jul 2016 23:24:18 +0000 (23:24 +0000)]
Merge "Support hardware colors for fingerprint video" into nyc-mr1-dev

8 years agoMerge \"Update FakeUid with new methods\" into nyc-mr1-dev
Adam Lesinski [Mon, 18 Jul 2016 21:16:03 +0000 (21:16 +0000)]
Merge \"Update FakeUid with new methods\" into nyc-mr1-dev
am: 30bef0a063

Change-Id: I3d9e4240c8986fad9ee3c3e3340027e127871d0b

8 years agoMerge "Update FakeUid with new methods" 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

8 years agoSupport hardware colors for fingerprint video
Maurice Lam [Fri, 15 Jul 2016 19:33:52 +0000 (12:33 -0700)]
Support hardware colors for fingerprint video

Bug: 28745754
Change-Id: Id86c2a6d882d4c4c4d1981da58de3e4c2059a50c

8 years agoDo not use TetherUtil.setWifiTethering
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

8 years agoMerge \"Refine fingerprint animation handling\" into nyc-mr1-dev
Wonsik Kim [Mon, 18 Jul 2016 15:39:00 +0000 (15:39 +0000)]
Merge \"Refine fingerprint animation handling\" into nyc-mr1-dev
am: 534d644326

Change-Id: I39dee0085df38c687831057710645277a3d4ac96

8 years agoMerge "Refine fingerprint animation handling" into nyc-mr1-dev
Wonsik Kim [Mon, 18 Jul 2016 15:31:17 +0000 (15:31 +0000)]
Merge "Refine fingerprint animation handling" into nyc-mr1-dev

8 years agoLock the orientation for FallbackHome
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

8 years agoUpdate FakeUid with new methods
Adam Lesinski [Sat, 16 Jul 2016 01:08:29 +0000 (18:08 -0700)]
Update FakeUid with new methods

Bug:28931278
Change-Id: I845337633b1840ae66bda065985624aa67b070df

8 years agoMerge \"Settings ViewPager now correctly handles RTL mode\" into nyc-mr1-dev
Matthew Fritze [Fri, 15 Jul 2016 19:17:07 +0000 (19:17 +0000)]
Merge \"Settings ViewPager now correctly handles RTL mode\" into nyc-mr1-dev
am: b8257e6fee

Change-Id: Id867babc43ed918eaf537a89284fe37d9068014d

8 years agoMerge "Settings ViewPager now correctly handles RTL mode" into nyc-mr1-dev
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

8 years agoSettings ViewPager now correctly handles RTL mode
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

8 years agoMerge \"Fix up for forget storage screen\" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 18:39:44 +0000 (18:39 +0000)]
Merge \"Fix up for forget storage screen\" into nyc-mr1-dev
am: f83ac369b0

Change-Id: Ie64332b1b99fbf0fe03046d9739f6145dc94bd66

8 years agoMerge "Fix up for forget storage screen" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 18:17:54 +0000 (18:17 +0000)]
Merge "Fix up for forget storage screen" into nyc-mr1-dev

8 years agoApplication names are now lazily loaded
Fyodor Kupolov [Fri, 15 Jul 2016 17:41:14 +0000 (17:41 +0000)]
Application names are now lazily loaded
am: c9b9898e9a

Change-Id: I598a0c4b44508dc96d4d18ffba8c2b53eb120a36

8 years agoApplication names are now lazily loaded
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

8 years agoFix crash from dismissing after pause
Jason Monk [Fri, 15 Jul 2016 17:18:48 +0000 (13:18 -0400)]
Fix crash from dismissing after pause

Change-Id: Ic9f655bff5aec5678d975389bc1f391b8d608099
Fixes: 29977187

8 years agoMerge \"Make sure to clear out preference cache when done\" into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 17:05:47 +0000 (17:05 +0000)]
Merge \"Make sure to clear out preference cache when done\" into nyc-mr1-dev
am: 9b0931e986

Change-Id: Ifc03fb29a5c4404448e6f1bfb844c7688b7f0810

8 years agoFix up for forget storage screen
Jason Monk [Fri, 15 Jul 2016 16:58:55 +0000 (12:58 -0400)]
Fix up for forget storage screen

Change-Id: Iaed41e2df377f1e2cb3026e2bdb69f29f9c2be5b
Fixes: 29904366

8 years agoMerge "Make sure to clear out preference cache when done" into nyc-mr1-dev
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

8 years agoMerge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 16:20:57 +0000 (16:20 +0000)]
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am: 080f794b6e

Change-Id: Ia7a8bda97395cb403ba1db94cb9048e1f43ed9e8

8 years agoMerge "Disallow user to block notification from OobConfig" 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

8 years agoMerge "Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c04...
Android Build Merger (Role) [Fri, 15 Jul 2016 14:14:21 +0000 (14:14 +0000)]
Merge "Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667  -s ours am: 2703570242 am: 2263a64eb8" into nyc-mr1-dev-plus-aosp

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481...
Jason Monk [Fri, 15 Jul 2016 14:14:08 +0000 (14:14 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667  -s ours am: 2703570242
am: 3dda853d77

Change-Id: If6f655e274469d80425a15ee429a0455448a19d9

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481...
Jason Monk [Fri, 15 Jul 2016 14:14:07 +0000 (14:14 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667  -s ours am: 2703570242
am: 2263a64eb8

Change-Id: I2dadb722e3b46bd11f72e5a125fb80c55ac5c5be

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481...
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

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481...
Jason Monk [Fri, 15 Jul 2016 14:11:29 +0000 (14:11 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481 am: e67f458667  -s ours
am: 2703570242

Change-Id: Ia0abf8f562cbec2afa86d5e85ecf22de190f86d6

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481
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

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf
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

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b
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

8 years agoPre-setup restrictions DO NOT MERGE
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am: e6ad6e866b

Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04

8 years agoMerge \"Disable instead of hiding add account preference\" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 03:47:52 +0000 (03:47 +0000)]
Merge \"Disable instead of hiding add account preference\" into nyc-mr1-dev
am: 8738e406c8

Change-Id: Ibe0bfa084e14dece83b19d4e62d50b96928b042a

8 years agoMerge "Disable instead of hiding add account preference" into nyc-mr1-dev
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Thu, 14 Jul 2016 20:26:06 +0000 (20:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 995a5144cf  -s ours

Change-Id: Ib0b91b99d2bab4eb2a7a5b0f5ea07155c41e02e8

8 years agoMerge "Import translations. DO NOT MERGE" 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

8 years agoMerge \"Open Security Patch Bulletin\" into nyc-mr1-dev
Andrew Sapperstein [Thu, 14 Jul 2016 13:59:18 +0000 (13:59 +0000)]
Merge \"Open Security Patch Bulletin\" into nyc-mr1-dev
am: 410273210d

Change-Id: Ia0e45925498c66af98a62725a02e1b31892dd01a

8 years agoMerge "Open Security Patch Bulletin" 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

8 years agoDisallow user to block notification from OobConfig
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

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

8 years agoDisable instead of hiding add account preference
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

8 years agoMerge \"Preemptively add string for direct boot dialogs.\" into nyc-mr1-dev
Jeff Sharkey [Thu, 14 Jul 2016 04:33:06 +0000 (04:33 +0000)]
Merge \"Preemptively add string for direct boot dialogs.\" into nyc-mr1-dev
am: 93cbd71610

Change-Id: I7869dfe57a964aa35a460a6fd8ccf9949709d6d1

8 years agoMerge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
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

8 years agoPreemptively add string for direct boot dialogs.
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

8 years agoMerge \"Revert equal check in DashboardAdapter.setCondition().\" into nyc-mr1-dev
Doris Ling [Thu, 14 Jul 2016 03:42:02 +0000 (03:42 +0000)]
Merge \"Revert equal check in DashboardAdapter.setCondition().\" into nyc-mr1-dev
am: 3468853cef

Change-Id: I136422e5b2dccf4f17ab5645bd6af48a1c47dc9a

8 years agoMerge "Revert equal check in DashboardAdapter.setCondition()." into nyc-mr1-dev
Doris Ling [Thu, 14 Jul 2016 03:34:00 +0000 (03:34 +0000)]
Merge "Revert equal check in DashboardAdapter.setCondition()." into nyc-mr1-dev

8 years agoRefine fingerprint animation handling
Wonsik Kim [Thu, 14 Jul 2016 02:58:47 +0000 (11:58 +0900)]
Refine fingerprint animation handling

Release stale SurfaceTexture and MediaPlayer when necessary.

Bug: 30104155
Change-Id: Ife5ba215fb962522cf007cd711a9329b4202cc39

8 years agoMerge \"Hide Set Wallpaper in Settings suggestion if it is not allowed\" into nyc...
Tony Mak [Thu, 14 Jul 2016 01:38:16 +0000 (01:38 +0000)]
Merge \"Hide Set Wallpaper in Settings suggestion if it is not allowed\" into nyc-mr1-dev
am: 1a8be1e372

Change-Id: Ic8a85dbb4b654f6df0bad993a1cce986f60ab193

8 years agoOpen Security Patch Bulletin
Andrew Sapperstein [Thu, 14 Jul 2016 01:27:43 +0000 (18:27 -0700)]
Open Security Patch Bulletin

When in device settings, in about phone, we show the current
security patch. Now, we'll also fire and intent to open a link
to the security bulletin page so users can see details about
their security patch.

Change-Id: I59c9e6ac0aecb0398992942a0fee4cb0a3cf268e
Fixes: 29828303

8 years agoMerge "Hide Set Wallpaper in Settings suggestion if it is not allowed" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 01:22:52 +0000 (01:22 +0000)]
Merge "Hide Set Wallpaper in Settings suggestion if it is not allowed" into nyc-mr1-dev

8 years agoMerge \"Add content description to escalation card title.\" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 23:36:52 +0000 (23:36 +0000)]
Merge \"Add content description to escalation card title.\" into nyc-mr1-dev
am: 31e5d5bb4b

Change-Id: I990a9c8a0adc41b976fcaaf177b90a74c32d4be7

8 years agoMerge \"Change \"ringer volume\" to \"ring volume\"\" into nyc-mr1-dev
Mike Tsao [Wed, 13 Jul 2016 23:36:51 +0000 (23:36 +0000)]
Merge \"Change \"ringer volume\" to \"ring volume\"\" into nyc-mr1-dev
am: bb15f3d14f

Change-Id: I29e001f902cadc579ab73f1399d12c061b26b36a

8 years agoMerge \"Rename Night display to Night Light\" into nyc-mr1-dev
Mike Tsao [Wed, 13 Jul 2016 23:36:50 +0000 (23:36 +0000)]
Merge \"Rename Night display to Night Light\" into nyc-mr1-dev
am: 6d0ed88746

Change-Id: Ie3a3782361b0dd5ffe5697f2730b39b9a3aa0e19

8 years agoMerge "Add content description to escalation card title." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 23:29:46 +0000 (23:29 +0000)]
Merge "Add content description to escalation card title." into nyc-mr1-dev

8 years agoRevert equal check in DashboardAdapter.setCondition().
Doris Ling [Wed, 13 Jul 2016 19:56:18 +0000 (12:56 -0700)]
Revert equal check in DashboardAdapter.setCondition().

1. Remove the equality check for the conditions list which causes
"Airplane mode is on" to be shown always even when airplane mode is
turned off.
2. Also add mIsShowingAll and mSuggestionMode to instance state.

Bug: 30055644
Change-Id: I0709e9a1b0139e80cdb834cb76a9334dce753e14

8 years agoMerge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:13:26 +0000 (22:13 +0000)]
Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev

8 years agoMerge "Rename Night display to Night Light" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge "Rename Night display to Night Light" into nyc-mr1-dev

8 years agoMerge \"Change launch method for preference Display->Ambient Display.\" into nyc...
Doris Ling [Wed, 13 Jul 2016 21:18:08 +0000 (21:18 +0000)]
Merge \"Change launch method for preference Display->Ambient Display.\" into nyc-mr1-dev
am: ea7e1b5d97

Change-Id: Idd7fd7cc03b1a52d713312def40f11b6974f1cdb

8 years agoMerge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev
Doris Ling [Wed, 13 Jul 2016 21:13:53 +0000 (21:13 +0000)]
Merge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev

8 years agoMerge \"Update summary and title strings for Settings Suggestions\" into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 21:12:53 +0000 (21:12 +0000)]
Merge \"Update summary and title strings for Settings Suggestions\" into nyc-mr1-dev
am: 5d8b432137

Change-Id: I0852939447039fdaefa14a151bba0f60aa4b6f43

8 years agoMerge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev
Matthew Fritze [Wed, 13 Jul 2016 21:03:33 +0000 (21:03 +0000)]
Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev

8 years agoMerge \"Update Safety & Regulatory Information link text\" into nyc-mr1-dev
Matthew Fritze [Wed, 13 Jul 2016 20:56:30 +0000 (20:56 +0000)]
Merge \"Update Safety & Regulatory Information link text\" into nyc-mr1-dev
am: 38415ff361

Change-Id: Ica24c00e555414bdc6c60e687975add88f8c9b8e

8 years agoMerge "Update Safety & Regulatory Information link text" into nyc-mr1-dev
Matthew Fritze [Wed, 13 Jul 2016 20:52:45 +0000 (20:52 +0000)]
Merge "Update Safety & Regulatory Information link text" into nyc-mr1-dev

8 years agoAdd content description to escalation card title.
Fan Zhang [Wed, 13 Jul 2016 18:50:09 +0000 (11:50 -0700)]
Add content description to escalation card title.

Bug: 30079904

In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.

Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2

8 years agoChange "ringer volume" to "ring volume"
Mike Tsao [Wed, 13 Jul 2016 19:52:32 +0000 (12:52 -0700)]
Change "ringer volume" to "ring volume"

Bug: 29565896

Changes all occurrences of "ringer volume" to "ring volume" in
Settings string file, including in comments.

Change-Id: Iad197dbbbbec16120fcd3ac835c1647a7f4c0c32

8 years agoMerge \"Cross fade escalation card when content changes.\" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 19:51:35 +0000 (19:51 +0000)]
Merge \"Cross fade escalation card when content changes.\" into nyc-mr1-dev
am: b10df69a84

Change-Id: I2fe2f2ab2cad15e1ee60ba7dafb3ccd7fd349604

8 years agoMerge "Cross fade escalation card when content changes." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 19:46:01 +0000 (19:46 +0000)]
Merge "Cross fade escalation card when content changes." into nyc-mr1-dev

8 years agoRename Night display to Night Light
Mike Tsao [Wed, 13 Jul 2016 19:31:38 +0000 (12:31 -0700)]
Rename Night display to Night Light

Bug: 30069874
Bug: 29584858

Renames generic "Night display" to "Night Light." Also changes feature
description to emphasize suitability for reading at night.

Change-Id: Ib54a22d7683853d7aadf4fe48795aaaa990b0333

8 years agoMerge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 18:57:40 +0000 (18:57 +0000)]
Merge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
am: 8b47c12550

Change-Id: I29e31e40f60f160e26c1ec17afb4cb60cbe90b7a

8 years agoMerge "Tweak layouts to make support UI look better." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 18:51:54 +0000 (18:51 +0000)]
Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev

8 years agoChange launch method for preference Display->Ambient Display.
Doris Ling [Wed, 13 Jul 2016 00:45:57 +0000 (17:45 -0700)]
Change launch method for preference Display->Ambient Display.

Change to launch using intent to maintain the activity title when
launching Moves from Display->Ambient Display.

Bug: 30034039
Change-Id: I7e8df04a5c6722320b342e09ea1977b5ba7a8ded

8 years agoMerge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am...
Mark Salyzyn [Wed, 13 Jul 2016 18:09:12 +0000 (18:09 +0000)]
Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
am: 2e6a8bb8f8

Change-Id: I67e73fbe05e88580d41bae73436e53a325655634

8 years agoMerge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am...
Mark Salyzyn [Wed, 13 Jul 2016 18:05:34 +0000 (18:05 +0000)]
Merge \\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\" am: a1b40f0267
am: 455006c9ca

Change-Id: Ia486d98338a1fdc60103324c99a46b31883af932

8 years agoMerge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
Mark Salyzyn [Wed, 13 Jul 2016 18:02:20 +0000 (18:02 +0000)]
Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28

8 years agoMerge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"
Treehugger Robot [Wed, 13 Jul 2016 17:45:44 +0000 (17:45 +0000)]
Merge "Settings: trampoline persist.logd.logpersistd to logd.logpersistd"

8 years agoMerge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapt...
Doris Ling [Wed, 13 Jul 2016 17:25:16 +0000 (17:25 +0000)]
Merge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapter\" into nyc-mr1-dev
am: 8c50ced07c

Change-Id: I0989b7f8e122d5221757b57b1866d536a1657ae3

8 years agoCross fade escalation card when content changes.
Fan Zhang [Wed, 13 Jul 2016 16:49:03 +0000 (09:49 -0700)]
Cross fade escalation card when content changes.

Fixes: 30079520

Whenever escalation card needs to change content:
- Instead of rebuilding entire data set, rebuild just escalation data.
- Instead of notify entire data set change, only notify the position
  change for escalation card.
This triggers the cross-fade animation in RecyclerView's
DefaultItemAnimator.

Change-Id: Ia19593d852fa6a1c366aecf9330d8274d7295e85