OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoTweak bluetooth name preference
Fan Zhang [Fri, 21 Jul 2017 18:34:39 +0000 (11:34 -0700)]
Tweak bluetooth name preference

- remove accent color from device name
- remove useless ripple when tap

Change-Id: I7800523eb27bafa24f3a4549b1acf02c869ac8c8
Fix: 62891178
Test: robotests

6 years agoMerge "Add some more logging to settings battery stuff" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 21:46:33 +0000 (21:46 +0000)]
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev

6 years agoMerge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev

6 years agoMerge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoEnsure that brightness level is within 0-100%.
Doris Ling [Wed, 5 Jul 2017 19:53:04 +0000 (12:53 -0700)]
Ensure that brightness level is within 0-100%.

Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270abbe0d05ae00f326539d3dde91450243)

6 years agoMerge "Zen priority settings update" into oc-dr1-dev
Julia Reynolds [Thu, 20 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 06:13:29 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoAdd some more logging to settings battery stuff
Salvador Martinez [Thu, 20 Jul 2017 00:14:21 +0000 (17:14 -0700)]
Add some more logging to settings battery stuff

This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.

Test: still build (only adds logging)
Bug: 62959645
Bug: 63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940

6 years agoMerge "Add separator to auto zen rule listing." into oc-dr1-dev
Julia Reynolds [Wed, 19 Jul 2017 16:44:07 +0000 (16:44 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev

6 years agoFix Settings manifest pointing to old class namespace
Evan Laird [Tue, 18 Jul 2017 20:37:42 +0000 (16:37 -0400)]
Fix Settings manifest pointing to old class namespace

The string declaring the right fragment was never updated to the new
namespace.

Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes: 63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

6 years agoMerge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 03:15:29 +0000 (03:15 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6c...
Phil Weaver [Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a  -s ours
am: b019e2c469

Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a  -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2

6 years agoMake time remaining estimate debug mode more reliable.
Alex Kulesza [Thu, 29 Jun 2017 16:27:19 +0000 (12:27 -0400)]
Make time remaining estimate debug mode more reliable.

Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().

Bug: 63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:50:50 +0000 (00:50 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec
am: 1faf81da83

Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a
am: d68bd495ec

Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0
am: 00143e1a7a

Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7
am: f5675a9ab0

Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d
am: 533c1efbc7

Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours
am: 2b8694c33d

Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
am: 4f8be72b18  -s ours

Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
am: f9d05230df

Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec

Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c

6 years agoMerge "Back-port ag/2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/2491664" into mnc-dev
am: 7b3ca9886e

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db

6 years agoMerge "Back-port ag/2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/2491664" into mnc-dev

6 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

6 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91...
Phil Weaver [Tue, 18 Jul 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b am: ae07650724
am: 3ae8ac0911

Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f

6 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91...
Phil Weaver [Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91 am: ade8640d4d am: 57f1af6a0b
am: ae07650724

Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4

6 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91...
Phil Weaver [Tue, 18 Jul 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91 am: ade8640d4d
am: 57f1af6a0b

Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999

6 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91
Phil Weaver [Tue, 18 Jul 2017 22:03:51 +0000 (22:03 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91
am: ade8640d4d

Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:56:10 +0000 (21:56 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c am: 3099a7f794
am: ce3fef5c99

Change-Id: I73eb7f86fd59536f8e9674a7406f83a3711b653e

6 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours
Phil Weaver [Tue, 18 Jul 2017 21:55:39 +0000 (21:55 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours
am: 6fee9a5e91

Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf am: 7a7d6b1d0c
am: 3099a7f794

Change-Id: Ib02617e2779b6da6569182cd94936dafc07b7422

6 years agoMerge "Back-port ag/2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)]
Merge "Back-port ag/2491664" into nyc-dev
am: 3adf585961  -s ours

Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:43:53 +0000 (21:43 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf
am: 7a7d6b1d0c

Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:24:36 +0000 (21:24 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c
am: 2e690de9cf

Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b

6 years agoMerge "Back-port ag/2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/2491664" into nyc-dev

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:13:41 +0000 (21:13 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3
am: a1426f209c

Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:09:55 +0000 (21:09 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349
am: af26bae8b3

Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 21:04:27 +0000 (21:04 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7
am: 066f79adc3

Change-Id: I3645f94b7220a956a95e13350e51e49a41204dcb

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 21:02:30 +0000 (21:02 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04
am: 625d4bffc7

Change-Id: Idb85f53bc0ad17856ee65b4cc2240bef6710851c

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 20:59:48 +0000 (20:59 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9
am: 55b3b1f349

Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:58:54 +0000 (20:58 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69
am: 2e2e6fcc04

Change-Id: I2d9d6a7fb0ac1d88a4e910e9e23e7160bbfcdafd

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:57:24 +0000 (20:57 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
am: 85aa9ccc69

Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6

6 years agoMerge "Never store battery stats for cache" into oc-dr1-dev
Lei Yu [Tue, 18 Jul 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Never store battery stats for cache" into oc-dr1-dev

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:54:26 +0000 (20:54 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac
am: ba26fabe3e

Change-Id: I78f285821bc170c9a32b6e911e38826123c81820

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 20:54:21 +0000 (20:54 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94
am: 46592e90a9

Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:52:25 +0000 (20:52 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671
am: 91f4a42dac

Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:49:55 +0000 (20:49 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d
am: 57aa22c671

Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780
am: 5d3967338d

Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d
am: 4c70016a94

Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9
Phil Weaver [Tue, 18 Jul 2017 20:46:34 +0000 (20:46 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9
am: f6b1267780

Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
Phil Weaver [Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
am: 4b029f8b0d

Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6

6 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
Phil Weaver [Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours
am: 9d889600a9

Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
Phil Weaver [Tue, 18 Jul 2017 20:28:31 +0000 (20:28 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
am: c84dc8feb3

Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a

6 years agoBack-port ag/2491664 am: 1d21738bd6
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791  -s ours

Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b

6 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
Phil Weaver [Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b

Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705

6 years agoMerge "Back-port ag/2491664" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Back-port ag/2491664" into lmp-dev
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd

6 years agoBack-port ag/2491664
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612

6 years agoMerge "Back-port ag/2491664" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/2491664" into lmp-dev

6 years agoMerge "Align the version number text view." into oc-dr1-dev
Daniel Nishi [Tue, 18 Jul 2017 17:14:48 +0000 (17:14 +0000)]
Merge "Align the version number text view." into oc-dr1-dev

6 years agoAdd new column user_editable to Carriers table in telephony db.
Amit Mahajan [Tue, 18 Jul 2017 01:23:53 +0000 (18:23 -0700)]
Add new column user_editable to Carriers table in telephony db.

Test: Verified manually that an APN with user_editable=false cannot be
modified via UI
Bug: 62852457
Change-Id: I1dbf2622b7fada8a201c990a06d07a9cdc258840

6 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

6 years agoZen priority settings update
Julia Reynolds [Mon, 17 Jul 2017 14:33:04 +0000 (10:33 -0400)]
Zen priority settings update

Reordering & adding summary

Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests

6 years agoAdd separator to auto zen rule listing.
Julia Reynolds [Mon, 17 Jul 2017 18:05:08 +0000 (14:05 -0400)]
Add separator to auto zen rule listing.

Test: manual
Change-Id: I9c3549832693d483ec5f0cf72a50909c18483fbb
Fixes: 63681398

6 years agoMerge "Build extra data in wakeup anomaly" into oc-dr1-dev
TreeHugger Robot [Tue, 18 Jul 2017 02:52:42 +0000 (02:52 +0000)]
Merge "Build extra data in wakeup anomaly" into oc-dr1-dev

6 years agoBuild extra data in wakeup anomaly
jackqdyulei [Tue, 18 Jul 2017 00:37:05 +0000 (17:37 -0700)]
Build extra data in wakeup anomaly

Wakeup Anomaly need this data to decide which action to take. The
previous cl adds it to wakelock anomaly, not wakeup anomaly.

Bug: 63777620
Test: RunSettingsRoboTests
Change-Id: I07c7252398add1573ea7de82953cbeabdbfe947d

6 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

6 years agoFix a bug where bt name is updated to wrong preference.
Fan Zhang [Mon, 17 Jul 2017 22:48:56 +0000 (15:48 -0700)]
Fix a bug where bt name is updated to wrong preference.

Change-Id: Ica0ef6763e8868fc33773f2db917aba29193b632
Fix: 63772093
Test: robotests

6 years agoMerge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 22:49:09 +0000 (22:49 +0000)]
Merge "Add setShouldBlink method to get SeekBarPreference" into oc-dr1-dev

6 years agoMerge "Add background color to suggestion/condition view." into oc-dr1-dev
TreeHugger Robot [Mon, 17 Jul 2017 22:18:31 +0000 (22:18 +0000)]
Merge "Add background color to suggestion/condition view." into oc-dr1-dev

6 years agoAlign the version number text view.
Daniel Nishi [Mon, 17 Jul 2017 22:15:10 +0000 (15:15 -0700)]
Align the version number text view.

Change-Id: I942b6b8f381332021bf6062afa5e0c7ae5e0bab7
Fixes: 63671892
Test: Manual

6 years agoAdd gestures as inline actions for Phone Buddy
Matthew Fritze [Sat, 8 Jul 2017 23:15:24 +0000 (16:15 -0700)]
Add gestures as inline actions for Phone Buddy

Add the following gestures as inline:
- Assist gesture
- Double tap power
- Double tap screen
- Pickup
- Swipe for notification

Bug:62022517
Test: make RunSettingsRoboTests
Change-Id: Ib246b97a0b924bf18f464d3548b7e4c393fc1931

6 years agoAdd setShouldBlink method to get SeekBarPreference
Kevin Chyn [Thu, 13 Jul 2017 01:19:45 +0000 (18:19 -0700)]
Add setShouldBlink method to get SeekBarPreference

Bug: 63642792

Test: make -j && make -j RunSettingsRoboTests
Change-Id: I92bb34282fe2b89644a3e004ec0da7d3c1f3db43

6 years agoMerge "Fix assist gesture keyword" into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 04:11:04 +0000 (04:11 +0000)]
Merge "Fix assist gesture keyword" into oc-dr1-dev

6 years agoMerge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 01:59:39 +0000 (01:59 +0000)]
Merge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev

6 years agoMerge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 01:05:41 +0000 (01:05 +0000)]
Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev

6 years agoFix assist gesture keyword
Kevin Chyn [Fri, 14 Jul 2017 23:10:12 +0000 (16:10 -0700)]
Fix assist gesture keyword

Bug: 63544783

Test: make -j RunSettingsRoboTests
Change-Id: Ief33fa9c556cc5a328401573459c7cbdd0053260

6 years agoNever store battery stats for cache
jackqdyulei [Fri, 14 Jul 2017 22:23:32 +0000 (15:23 -0700)]
Never store battery stats for cache

In PowerUsageBase, it will store battery stats if it has a configuration
change, which will make BatteryStatsLoaderHelper never get the correct
battery stats because it uses Bundle.EMPTY as the bundle message.

This cl:
1. Remove the store action even though it is configuration change.
2. Always use null to get battery stats
3. Always start a battery status check in register()

Bug: 63658232
Test: RunSettingsRoboTests
Change-Id: Ifbf970c63378ed66dddcdae4d952b7d1fd84216a

6 years agoAdd background color to suggestion/condition view.
Doris Ling [Fri, 14 Jul 2017 21:45:17 +0000 (14:45 -0700)]
Add background color to suggestion/condition view.

- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual

6 years agoMerge "Fix crash on expanding settings conditions." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 22:18:26 +0000 (22:18 +0000)]
Merge "Fix crash on expanding settings conditions." into oc-dr1-dev

6 years agoMerge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:47:50 +0000 (21:47 +0000)]
Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev

6 years agoMerge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:51:09 +0000 (20:51 +0000)]
Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev

6 years agoShow keypad while setting PIN in setup wizard
Tarandeep Singh [Fri, 14 Jul 2017 20:22:07 +0000 (13:22 -0700)]
Show keypad while setting PIN in setup wizard

Currently The activity not requesting showSoftInput() and hence keypad
doesn't show up.
Activity.onResume(), we should call ImeAwareEditText.scheduleSoftInput()
to request schedule ShowSoftInput() when EditText gains focus.

Fixes: 63582564
Test: Manually launch com.google.android.setupwizard/.SetupWizardTestActivity

Change-Id: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82

6 years agoFix crash on expanding settings conditions.
Doris Ling [Fri, 14 Jul 2017 19:54:36 +0000 (12:54 -0700)]
Fix crash on expanding settings conditions.

Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Merged-In: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests

6 years agoUpdate spacing in suggestion/condition header and footer.
Doris Ling [Fri, 14 Jul 2017 18:45:54 +0000 (11:45 -0700)]
Update spacing in suggestion/condition header and footer.

Adjust the top/bottom padding for the header and footer so that the
content is center-aligned.

Change-Id: I01c0baf770abf3a8767a016a758ee1794403598b
Fix: 63670820
Test: Visual

6 years agoFix left aligned "Wi-Fi" category title in data usage page.
Doris Ling [Wed, 12 Jul 2017 21:45:31 +0000 (14:45 -0700)]
Fix left aligned "Wi-Fi" category title in data usage page.

Set thee category title text view to align at the start position.

Change-Id: I9a297588e2f742d20b0d07bd6979e0378e41cb71
Merged-In: Iff5fbc595ec16396043d64a1ceb0fa81e874ea48
Merged-In: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
Fix: 63399239
Test: visual

6 years agoFix enhanced estimate discharge text showing while charging
Salvador Martinez [Thu, 13 Jul 2017 21:20:28 +0000 (14:20 -0700)]
Fix enhanced estimate discharge text showing while charging

In the PowerUsageAdvanced screen the text showing whether your time
remaining information is enhanced or not should not show when the
device is plugged in. This CL fixes a bug in that logic that would
show the text when it wasn't supposed to.

Test: robotests still pass, manual verification
Bug: 63176050
Change-Id: I33fb31671cd9c29aed20483301e51ae1ded1f1b6

6 years agoMerge "Add metric action for bt rename dialog" into oc-dr1-dev
Lei Yu [Fri, 14 Jul 2017 17:19:32 +0000 (17:19 +0000)]
Merge "Add metric action for bt rename dialog" into oc-dr1-dev

6 years agoMerge "Remove automatic rule icons" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 16:45:49 +0000 (16:45 +0000)]
Merge "Remove automatic rule icons" into oc-dr1-dev

6 years agoRemove automatic rule icons
Julia Reynolds [Fri, 14 Jul 2017 14:03:56 +0000 (10:03 -0400)]
Remove automatic rule icons

Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes: 63623747

6 years agoMerge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev

6 years agoAdd metric action for bt rename dialog
jackqdyulei [Tue, 11 Jul 2017 18:15:25 +0000 (11:15 -0700)]
Add metric action for bt rename dialog

Bug: 63553537
Test: runtest -x BluetoothNetworkSettingsTests
Change-Id: Ic618133da513bb0c22ac4d79e5d7cb75412a93dd