OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Update signature when calling CategoryManager.get."
Fan Zhang [Wed, 5 Oct 2016 00:14:50 +0000 (00:14 +0000)]
Merge "Update signature when calling CategoryManager.get."

7 years agoMerge "Add storage dashborad page."
Fan Zhang [Wed, 5 Oct 2016 00:10:27 +0000 (00:10 +0000)]
Merge "Add storage dashborad page."

7 years agoMerge "Give CTS the handle it expects to remove PIN."
Jeff Sharkey [Tue, 4 Oct 2016 22:19:35 +0000 (22:19 +0000)]
Merge "Give CTS the handle it expects to remove PIN."

7 years agoUpdate signature when calling CategoryManager.get.
Fan Zhang [Tue, 4 Oct 2016 22:18:02 +0000 (15:18 -0700)]
Update signature when calling CategoryManager.get.

Bug: 31781480
Test: compiles
Change-Id: Iee715aca3767a67728527ba9390787d3f8a7e5fe

7 years agoAdd storage dashborad page.
Fan Zhang [Tue, 4 Oct 2016 20:21:06 +0000 (13:21 -0700)]
Add storage dashborad page.

Refactor shared dashboard page display logic between storage and
system page.

Bug: 31800690
Test: RunSettingsRoboTests

Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193

7 years agoMerge "Add search provider for system dashboard fragment."
Fan Zhang [Tue, 4 Oct 2016 19:52:14 +0000 (19:52 +0000)]
Merge "Add search provider for system dashboard fragment."

7 years agoGive CTS the handle it expects to remove PIN.
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
Give CTS the handle it expects to remove PIN.

When the Direct Boot tests go to remove the PIN set in previous
tests, it needs to find the option that will remove the PIN.  Recent
changes for fingerprint caused this "none" option to be hidden, so
assign the "none" ID to the "skip" option.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug: 31160946
Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27

7 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:50:50 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoAdd search provider for system dashboard fragment.
Fan Zhang [Tue, 4 Oct 2016 00:11:11 +0000 (17:11 -0700)]
Add search provider for system dashboard fragment.

Bug: 31801428
Test: manual
Test:make RunSettingsRoboTests
Change-Id: I6a80d64ed9755f4ddcfde33a82be04cfcbf0495b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 05:19:39 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Listen to category changes in preference fragment."
Fan Zhang [Tue, 4 Oct 2016 01:41:01 +0000 (01:41 +0000)]
Merge "Listen to category changes in preference fragment."

7 years agoMerge "Move system update preference from device_info to system."
Fan Zhang [Mon, 3 Oct 2016 23:44:57 +0000 (23:44 +0000)]
Merge "Move system update preference from device_info to system."

7 years agoListen to category changes in preference fragment.
Fan Zhang [Mon, 3 Oct 2016 20:46:22 +0000 (13:46 -0700)]
Listen to category changes in preference fragment.

Bug: 31781480
Test: make RunSettingsRoboTests
Change-Id: I702e524eb3a9e40b653e112dba80d620be3bc9bb

7 years agoMerge "Fix a NPE when rotating dialog created by DialogCreatable."
Fan Zhang [Mon, 3 Oct 2016 22:46:37 +0000 (22:46 +0000)]
Merge "Fix a NPE when rotating dialog created by DialogCreatable."

7 years agoMove system update preference from device_info to system.
Fan Zhang [Mon, 3 Oct 2016 18:05:08 +0000 (11:05 -0700)]
Move system update preference from device_info to system.

In order to move the preference and its logic cleanly, created a
controller object that encapsulates the preference/click handler.

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I332384e20fbf0e21d2f3becb531d97b20f7f7ef1

7 years agoFix a NPE when rotating dialog created by DialogCreatable.
Fan Zhang [Mon, 3 Oct 2016 20:48:55 +0000 (13:48 -0700)]
Fix a NPE when rotating dialog created by DialogCreatable.

Bug: 30088727
Test: make RunSettingsRoboTests
Change-Id: I775899809dfe920daa294f70d646b141da7c0706

7 years agoMerge "BluetoothDialog view fixed for no pair code case"
Salvador Martinez [Mon, 3 Oct 2016 19:52:12 +0000 (19:52 +0000)]
Merge "BluetoothDialog view fixed for no pair code case"

7 years agoMerge "Wrap layout content so that "Open by default" view does not scroll."
Stephen Chen [Mon, 3 Oct 2016 18:06:45 +0000 (18:06 +0000)]
Merge "Wrap layout content so that "Open by default" view does not scroll."

7 years agoMerge "Fix a NPE in confirm lock screen."
TreeHugger Robot [Mon, 3 Oct 2016 17:43:18 +0000 (17:43 +0000)]
Merge "Fix a NPE in confirm lock screen."

7 years agoFix a NPE in confirm lock screen.
Fan Zhang [Mon, 3 Oct 2016 16:05:55 +0000 (09:05 -0700)]
Fix a NPE in confirm lock screen.

Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes: 31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 1 Oct 2016 08:54:37 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 01:03:55 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2 am: c94ac39096
Matthew Fritze [Sat, 1 Oct 2016 00:40:50 +0000 (00:40 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2 am: c94ac39096
am: cbd7df8e5d

Change-Id: I5313938ff9f700ae2c941ca19fb57e991a7915ee

7 years agoPrevent double tap on suggestions am: 703dc60b14 am: ae3ad11e69
Matthew Fritze [Sat, 1 Oct 2016 00:40:35 +0000 (00:40 +0000)]
Prevent double tap on suggestions am: 703dc60b14 am: ae3ad11e69
am: 8bf5fa437e

Change-Id: I5c5dae114f51364f63fe37b6511e5bd1c376282a

7 years agoTablet Settings support tab has start/end padding am: 839be498b6 am: 4de4d8801d
Matthew Fritze [Sat, 1 Oct 2016 00:40:20 +0000 (00:40 +0000)]
Tablet Settings support tab has start/end padding am: 839be498b6 am: 4de4d8801d
am: 0d90d66c3b

Change-Id: If3f3869ea2c525475edc8428a04c6aa1461a9ab1

7 years agoRearrange a few settings into System category page.
Fan Zhang [Thu, 29 Sep 2016 21:37:14 +0000 (14:37 -0700)]
Rearrange a few settings into System category page.

- Use activity-alias to define which activity shows up in what category.
  We choose activity-alias because it creates a reference to UI we need
  without having to define a new set of intent-filter and/or category
  keys. This reduces maintainence in the long run. We should merge
  metadata from activity-alias into targetActivity when cleaning up.

- Created new System dashboard activity that hosts all system category
  tiles dynamically, and a static tile for checking system update.

Bug: 31781480
Test: manual
Test: make RunSettingsRoboTests -j40
Change-Id: Ia2d762e3e1aebd17423a395c5e6c286dc3326492

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
Matthew Fritze [Fri, 30 Sep 2016 22:48:12 +0000 (22:48 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
am: c94ac39096

Change-Id: I25635d1153694924fdd025b31185c9ac4ffdcff8

7 years agoPrevent double tap on suggestions am: 703dc60b14
Matthew Fritze [Fri, 30 Sep 2016 22:47:58 +0000 (22:47 +0000)]
Prevent double tap on suggestions am: 703dc60b14
am: ae3ad11e69

Change-Id: Ie53d72bf5e504cdc87d01ce0aeef1683b9d72214

7 years agoTablet Settings support tab has start/end padding am: 839be498b6
Matthew Fritze [Fri, 30 Sep 2016 22:47:45 +0000 (22:47 +0000)]
Tablet Settings support tab has start/end padding am: 839be498b6
am: 4de4d8801d

Change-Id: I47af4f65b405346e5ceae8006f7b09d4763dc8ad

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 22:41:33 +0000 (22:41 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
am: d8435d57d2

Change-Id: Ia59ca2de3d5f90bb80c62ad3615197ccefc6f461

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 22:41:32 +0000 (22:41 +0000)]
Prevent double tap on suggestions
am: 703dc60b14

Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f

7 years agoTablet Settings support tab has start/end padding
Matthew Fritze [Fri, 30 Sep 2016 22:38:23 +0000 (22:38 +0000)]
Tablet Settings support tab has start/end padding
am: 839be498b6

Change-Id: I6e58352f95e5f5947a3d4ae111f3cf4a709462b7

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 22:33:46 +0000 (22:33 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev

7 years agoTablet Settings support tab has start/end padding
Matthew Fritze [Wed, 28 Sep 2016 21:30:17 +0000 (14:30 -0700)]
Tablet Settings support tab has start/end padding

Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 19:36:27 +0000 (12:36 -0700)]
Prevent double tap on suggestions

Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366

7 years agoBluetoothDialog view fixed for no pair code case
Salvador Martinez [Fri, 30 Sep 2016 20:59:30 +0000 (13:59 -0700)]
BluetoothDialog view fixed for no pair code case

BluetoothPairingDialog no longer asks for a
pair code when the user only needs to
confirm that they would like to connect
to a device. Also, the layout padding
was updated a bit to make it look nicer.

Test: RunSettingsRoboTests
Bug: 31340598
Change-Id: I9394fcd53dffcff9a17fbafabdce0e94ae88fba2

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
Matthew Fritze [Fri, 30 Sep 2016 17:02:41 +0000 (17:02 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250 am: b0722aeb88
am: 3d4df23a17

Change-Id: I370874b94565d066762f2b1b8a4a46a5c4d92295

7 years agoSupport dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
Matthew Fritze [Fri, 30 Sep 2016 17:02:27 +0000 (17:02 +0000)]
Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
am: 1869973e12

Change-Id: I780f4b595fe276a3898237eb42d0852e7a7a5321

7 years agoMerge "resolve merge conflicts of af840b5 to master"
TreeHugger Robot [Fri, 30 Sep 2016 16:58:49 +0000 (16:58 +0000)]
Merge "resolve merge conflicts of af840b5 to master"

7 years agoresolve merge conflicts of af840b5 to master
Garfield Tan [Fri, 30 Sep 2016 00:20:27 +0000 (17:20 -0700)]
resolve merge conflicts of af840b5 to master

Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121

7 years agoMerge "Fix compile issues in Settings."
Tomasz Mikolajewski [Fri, 30 Sep 2016 00:39:53 +0000 (00:39 +0000)]
Merge "Fix compile issues in Settings."

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
Matthew Fritze [Fri, 30 Sep 2016 00:22:31 +0000 (00:22 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
am: b0722aeb88

Change-Id: Iee75b36e9c6a07bbadfebd8e561edc352492520a

7 years agoSupport dialog disclaimer text now appears properly am: adc5555acf
Matthew Fritze [Fri, 30 Sep 2016 00:22:26 +0000 (00:22 +0000)]
Support dialog disclaimer text now appears properly am: adc5555acf
am: bbe0e8a30b

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 00:20:29 +0000 (00:20 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
am: cf0f301250

Change-Id: I3279202d4e7d9e836ca5173c9f4169c92c052d15

7 years agoSupport dialog disclaimer text now appears properly
Matthew Fritze [Fri, 30 Sep 2016 00:20:27 +0000 (00:20 +0000)]
Support dialog disclaimer text now appears properly
am: adc5555acf

Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 00:12:55 +0000 (00:12 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev

7 years agoMerge "WifiCallingSettings: remove MetricsLogger"
Meng Wang [Fri, 30 Sep 2016 00:01:59 +0000 (00:01 +0000)]
Merge "WifiCallingSettings: remove MetricsLogger"

7 years agoLaunch other info in storage in correct user id. am: 493bf348b9
Garfield Tan [Thu, 29 Sep 2016 23:29:21 +0000 (23:29 +0000)]
Launch other info in storage in correct user id. am: 493bf348b9
am: 1ab4f4b816

Change-Id: I93d5222647efd84eb6c1d159c053455fbb382c13

7 years agoLaunch other info in storage in correct user id.
Garfield Tan [Thu, 29 Sep 2016 23:23:50 +0000 (23:23 +0000)]
Launch other info in storage in correct user id.
am: 493bf348b9

Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b

7 years agoSupport dialog disclaimer text now appears properly
Matthew Fritze [Thu, 29 Sep 2016 22:03:28 +0000 (15:03 -0700)]
Support dialog disclaimer text now appears properly

The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f

7 years agoLaunch other info in storage in correct user id.
Garfield Tan [Thu, 29 Sep 2016 21:14:54 +0000 (14:14 -0700)]
Launch other info in storage in correct user id.

Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee

7 years agoMerge "Use DashboardFeatureProvider to load homepage tiles."
TreeHugger Robot [Thu, 29 Sep 2016 21:19:30 +0000 (21:19 +0000)]
Merge "Use DashboardFeatureProvider to load homepage tiles."

7 years agoMerge "Reduces top space in lock password screen in sw600dp-land."
Jaewoong Jung [Thu, 29 Sep 2016 20:38:21 +0000 (20:38 +0000)]
Merge "Reduces top space in lock password screen in sw600dp-land."

7 years agoMerge "Maintain focus on switch for a11y"
TreeHugger Robot [Thu, 29 Sep 2016 20:03:47 +0000 (20:03 +0000)]
Merge "Maintain focus on switch for a11y"

7 years agoWifiCallingSettings: remove MetricsLogger
Meng Wang [Thu, 29 Sep 2016 18:36:11 +0000 (11:36 -0700)]
WifiCallingSettings: remove MetricsLogger

Test: make
Change-Id: Ifd9ac2f6b35bd851f29189c090e49c0728730ec0

7 years agoUse DashboardFeatureProvider to load homepage tiles.
Fan Zhang [Wed, 28 Sep 2016 00:51:11 +0000 (17:51 -0700)]
Use DashboardFeatureProvider to load homepage tiles.

Adding support to homepage category.

Test: SettingsRoboTests for regression. Will write tests for new feature
soon once we are set on the data structure.
Bug: 31781480

Change-Id: I25fa367fecb643f17e23f0182df7585bf1fcdd02

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 29 Sep 2016 18:54:18 +0000 (18:54 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Settings timeout for suggestions"
TreeHugger Robot [Thu, 29 Sep 2016 18:44:23 +0000 (18:44 +0000)]
Merge "Settings timeout for suggestions"

7 years agoSettings timeout for suggestions
Salvador Martinez [Tue, 20 Sep 2016 00:02:37 +0000 (17:02 -0700)]
Settings timeout for suggestions

If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.

Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0

7 years agoReduces top space in lock password screen in sw600dp-land.
Jaewoong Jung [Thu, 29 Sep 2016 18:30:49 +0000 (11:30 -0700)]
Reduces top space in lock password screen in sw600dp-land.

Bug: 31448445
Test: Manual inspection.
Change-Id: Iee780b8755d125c0d00adcd004fc374fe3ac2176

7 years agoMaintain focus on switch for a11y
Salvador Martinez [Thu, 29 Sep 2016 17:49:42 +0000 (10:49 -0700)]
Maintain focus on switch for a11y

Modified subsetting where user can toggle
if an app should be able to modify system
settings so that talkback announces state
change properly.

Test: Accessibility Scanner, Manual Verification
Bug: 31755538
Change-Id: I54ad016b5edb0937b77cfdeef0cfcae24a78e2a2

7 years agoMerge "Add classloader for RtlCompatibleViewPager"
Lei Yu [Thu, 29 Sep 2016 16:52:36 +0000 (16:52 +0000)]
Merge "Add classloader for RtlCompatibleViewPager"

7 years agoWifiCallingSettings: Fix build.
Narayan Kamath [Thu, 29 Sep 2016 14:09:55 +0000 (15:09 +0100)]
WifiCallingSettings: Fix build.

Test: make
Change-Id: Ic22e32c960380fd6c2a6fa959d613941d13d815b

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours...
Bill Yi [Thu, 29 Sep 2016 08:07:18 +0000 (08:07 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours am: ae35fa061e  -s ours am: a69e26abbf  -s ours
am: 58fb70211c  -s ours

Change-Id: I485c9bae825e7babd507e7ad0b7f33f070993c09

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours...
Bill Yi [Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours am: c53fb015d9  -s ours
am: 1ed1b99ad0  -s ours

Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed

7 years agoImport translations. DO NOT MERGE am: 4ae03656ac -s ours am: ae3ec3984d -s ours
Bill Yi [Thu, 29 Sep 2016 08:06:50 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am: 4ae03656ac  -s ours am: ae3ec3984d  -s ours
am: d44a01ba45  -s ours

Change-Id: I103cc64e34aaac7afe85d8b750a903c181cd6c82

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours
Bill Yi [Thu, 29 Sep 2016 08:01:47 +0000 (08:01 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours am: ae35fa061e  -s ours
am: a69e26abbf  -s ours

Change-Id: If22270482cf8caffc0baa84e6205903e73f1f7fc

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:41 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours
am: c53fb015d9  -s ours

Change-Id: I86a1e1bd6a7ef84d41b743d1ac1b0827183ff94f

7 years agoImport translations. DO NOT MERGE am: 4ae03656ac -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:26 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am: 4ae03656ac  -s ours
am: ae3ec3984d  -s ours

Change-Id: I43fbba4e5f8c55a438233ac120f0af00300b8a25

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:16 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours
am: ae35fa061e  -s ours

Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 07:53:15 +0000 (07:53 +0000)]
Import translations. DO NOT MERGE
am: dccfc04a3e  -s ours

Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 29 Sep 2016 07:48:48 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f497c48345  -s ours

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 07:48:46 +0000 (07:48 +0000)]
Import translations. DO NOT MERGE
am: 4ae03656ac  -s ours

Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 07:40:48 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoFix compile issues in Settings.
Tomasz Mikolajewski [Thu, 29 Sep 2016 07:39:18 +0000 (16:39 +0900)]
Fix compile issues in Settings.

Change-Id: Ica2296c30098173edf452018ccd7cc0f8731be53
Test: Compiles.
Bug: 31664539

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:25:18 +0000 (23:25 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:20:25 +0000 (23:20 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:12:29 +0000 (23:12 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc...
Hugo Benichi [Thu, 29 Sep 2016 05:59:54 +0000 (05:59 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc am: 9bd60dd8ac
am: f153b4bfc8

Change-Id: I8d577e0bf2edc97bcf0c3a6b39bb29a27db75a6b

7 years agoUpdate text of wifi to cell autoswitch toggle am: 1968fb1fd4 am: b00a9135ba
Hugo Benichi [Thu, 29 Sep 2016 05:59:38 +0000 (05:59 +0000)]
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4 am: b00a9135ba
am: 55e04b82af

Change-Id: I5d3f8e6f7e8b158ade94cd757940d3134e6f1d81

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c...
Matthew Fritze [Thu, 29 Sep 2016 05:59:22 +0000 (05:59 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c am: 493350dcf7
am: 7d79557c56

Change-Id: I0f5cb93802bea6f7f5af9e586a65d7e6a6a42d8c

7 years agoTablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
Matthew Fritze [Thu, 29 Sep 2016 05:59:08 +0000 (05:59 +0000)]
Tablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
am: fa7aa9663e

Change-Id: I7865b06593fc99cabe78dac7bb4a3574dea79404

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d...
Meng Wang [Thu, 29 Sep 2016 05:58:51 +0000 (05:58 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d am: 2c545d5bfa
am: 82812ff668

Change-Id: Ida62a975931cd05e2af01f66d337df8f0702fffc

7 years agoWiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
Meng Wang [Thu, 29 Sep 2016 05:55:00 +0000 (05:55 +0000)]
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
am: 9f0d5f7e5d

Change-Id: Ie899eba9566d12534dd9bf524542c1a5f00cb38b

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
Hugo Benichi [Thu, 29 Sep 2016 03:50:16 +0000 (03:50 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
am: 9bd60dd8ac

Change-Id: I0abb48f432879b686ee179069c366753ada31161

7 years agoUpdate text of wifi to cell autoswitch toggle am: 1968fb1fd4
Hugo Benichi [Thu, 29 Sep 2016 03:50:01 +0000 (03:50 +0000)]
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
am: b00a9135ba

Change-Id: Icb2059fe884e7020ad843158db1af444b2641d61

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
Hugo Benichi [Thu, 29 Sep 2016 03:46:11 +0000 (03:46 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
am: c81e1141cc

Change-Id: Idf215a22923b96129462579816e170655f99d4e8

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 03:46:10 +0000 (03:46 +0000)]
Update text of wifi to cell autoswitch toggle
am: 1968fb1fd4

Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 03:38:46 +0000 (03:38 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 00:16:55 +0000 (09:16 +0900)]
Update text of wifi to cell autoswitch toggle

Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0

7 years agoWrap layout content so that "Open by default" view does not scroll.
Stephen Chen [Wed, 28 Sep 2016 23:13:12 +0000 (16:13 -0700)]
Wrap layout content so that "Open by default" view does not scroll.

Bug: 29088583
Change-Id: I2f4d102b2997042bf06778f2094d8dcd0b5d15f7
Fixes: 29088583
Test: Visually verified

7 years agoAdd classloader for RtlCompatibleViewPager
jackqdyulei [Wed, 28 Sep 2016 21:57:26 +0000 (14:57 -0700)]
Add classloader for RtlCompatibleViewPager

To avoid BadParcelableException when reload the activity after it
is killed by OS.

Bug: 31707097
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk && \
adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: Ic8f20d9e2d236f0bea96071a88fbc6e7ba856f54

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
Matthew Fritze [Thu, 29 Sep 2016 00:36:18 +0000 (00:36 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7

Change-Id: I9b1e216adddaa1e995ef0d80280fc47d7a02bad8

7 years agoTablet Settings Layout is no longer stretched am: c4a9b18121
Matthew Fritze [Thu, 29 Sep 2016 00:36:04 +0000 (00:36 +0000)]
Tablet Settings Layout is no longer stretched am: c4a9b18121
am: a936610ae2

Change-Id: Ib6d604f753d3424d67396c9e051829cad43d6d76

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
Meng Wang [Thu, 29 Sep 2016 00:35:49 +0000 (00:35 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
am: 2c545d5bfa

Change-Id: I06bdabaabc3baec3faa82182cf8e0d0e208e252b

7 years agoWiFiCallingSettings: show roaming preferrence am: fe3749dd0b
Meng Wang [Thu, 29 Sep 2016 00:30:54 +0000 (00:30 +0000)]
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9

Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
Matthew Fritze [Thu, 29 Sep 2016 00:27:18 +0000 (00:27 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
am: 6cafff3b2c

Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade

7 years agoTablet Settings Layout is no longer stretched
Matthew Fritze [Thu, 29 Sep 2016 00:27:17 +0000 (00:27 +0000)]
Tablet Settings Layout is no longer stretched
am: c4a9b18121

Change-Id: Ie103fd6248bd206e517c5f7de880b76862b831ba

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:26:56 +0000 (00:26 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
am: 2f6eef699d

Change-Id: Id6d84cd51171da42f21894617ec26fb48e45cfa9

7 years agoWiFiCallingSettings: show roaming preferrence
Meng Wang [Thu, 29 Sep 2016 00:22:18 +0000 (00:22 +0000)]
WiFiCallingSettings: show roaming preferrence
am: fe3749dd0b

Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85