Commit Graph

45538 Commits

Author SHA1 Message Date
android-build-team Robot
579300b00c Merge "Show Option of "Screen lock options" on SUW pattern screen page" 2018-05-09 19:09:08 +00:00
android-build-team Robot
02ec86a17b Merge "Establish permanently unavailable settings" 2018-05-09 18:14:32 +00:00
android-build-team Robot
c0e0262f9c Merge "Rename SubSettingLauncher.setTitle, add java doc" 2018-05-09 18:01:10 +00:00
Matthew Fritze
f87a1f3f41 Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Bug: 79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 08:36:59 -07:00
android-build-team Robot
7ce6ba52c5 Merge "Change references to old loadSafeLabel method" 2018-05-09 15:28:33 +00:00
android-build-team Robot
0e79a3a733 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9a1d318b37 -s ours
am: 09df358bd8  -s ours

Change-Id: Iaa228298b45bc1686cc07faa22c65e0062d8d25d
2018-05-08 21:09:12 -07:00
android-build-team Robot
09df358bd8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9a1d318b37  -s ours

Change-Id: Ie5f9d8b1e7883d2e523a8481616bcb24c3dd9b40
2018-05-08 21:04:42 -07:00
android-build-team Robot
b395027f81 Merge "Import translations. DO NOT MERGE" 2018-05-09 03:56:40 +00:00
android-build-team Robot
9a1d318b37 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-05-09 03:56:36 +00:00
Hugh Chen
2a72c197e1 [automerger skipped] Merge "Change the title when in call/media state" into pi-dev am: 32adc82c8a
am: 44526c44ca  -s ours

Change-Id: I464549ce35281bcb57e15fddacf2d21ee83b1d66
2018-05-08 20:14:16 -07:00
Hugh Chen
44526c44ca Merge "Change the title when in call/media state" into pi-dev
am: 32adc82c8a

Change-Id: I9f066891464c55fb88ddd95b4f669c3f4e82ebbd
2018-05-08 20:09:49 -07:00
Hugh Chen
32adc82c8a Merge "Change the title when in call/media state" into pi-dev 2018-05-09 03:06:04 +00:00
android-build-team Robot
11c3af70e1 Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: f4dd526f70
am: 3f40c15294

Change-Id: I169db327d5e07732e45164510244f320787339b0
2018-05-08 19:51:43 -07:00
android-build-team Robot
3f40c15294 Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am: f4dd526f70

Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd
2018-05-08 19:46:35 -07:00
android-build-team Robot
f4dd526f70 Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev 2018-05-09 02:36:26 +00:00
android-build-team Robot
d284fe11aa Merge "Prevent crashes on null intent in Slice Builder" into pi-dev am: 69fce6df71
am: 46dd838e8d

Change-Id: I2048cd12599e9d2ad115f2e6b1a6371feb2e72ae
2018-05-08 19:32:29 -07:00
android-build-team Robot
46dd838e8d Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
am: 69fce6df71

Change-Id: I9a7e5a5531a81513fb7a0721d04a419cfe957295
2018-05-08 19:28:29 -07:00
android-build-team Robot
37dc457969 Merge "Stop logging tether password in logcat & metrics provider" into pi-dev am: af7d41978c
am: 94907ce4c7

Change-Id: Ieb165e0f0be927f92846bbbce3328576d8a4a1e5
2018-05-08 19:23:39 -07:00
android-build-team Robot
69fce6df71 Merge "Prevent crashes on null intent in Slice Builder" into pi-dev 2018-05-09 02:22:17 +00:00
android-build-team Robot
94907ce4c7 Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
am: af7d41978c

Change-Id: Iff2cc5c284add3017d307ced73b71fe101f13ecc
2018-05-08 19:15:41 -07:00
hughchen
50d5c0a544 Change the title when in call/media state
* Change the title when in call/media state.
  Example: call state show "Available call devices"
           media state show "Available media devices"
* Use isAudioModeOngoingCall() utility function for checking if it is in call status
* Add register test to verify when in onStart() and onStop()
  the BluetoothCallback can be register and unregister.
* Add title string test to verify when in call or media state,
  the title can be changed to corresponding string

Bug: 78150641
Test: make -j40 RunSettingsRoboTests
Change-Id: I6be72cf0cae75525084ac3c5be8524c709f51f7d
Merged-In: I6be72cf0cae75525084ac3c5be8524c709f51f7d
2018-05-09 02:03:38 +00:00
android-build-team Robot
af7d41978c Merge "Stop logging tether password in logcat & metrics provider" into pi-dev 2018-05-09 02:03:03 +00:00
hjchangliao
e86eec0c07 Rename SubSettingLauncher.setTitle, add java doc
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.

Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes: 78347436
Test: make RunSettingsRoboTests
2018-05-09 10:00:05 +08:00
Hugh Chen
66ec6d48a2 Merge "Change the title when in call/media state" 2018-05-09 01:43:53 +00:00
android-build-team Robot
ea2bace446 Merge "Update strings for summary tip." into pi-dev am: 0e7cff80ef
am: 171ec14458

Change-Id: I564c2f2099bfba4ba9a8327d7b426365bb4f7bd9
2018-05-08 17:57:04 -07:00
android-build-team Robot
171ec14458 Merge "Update strings for summary tip." into pi-dev
am: 0e7cff80ef

Change-Id: I4c891ea16e4fed831998cf609a5d5d2418528856
2018-05-08 17:53:01 -07:00
Doris Ling
8ab5eab71b Merge "Update arrow icon for see all apps." into pi-dev am: 6bc31d343e
am: 2f2d676897

Change-Id: Ibd0dd41ba169c057cc0af2357018d55e06d03bc9
2018-05-08 17:48:31 -07:00
android-build-team Robot
0e7cff80ef Merge "Update strings for summary tip." into pi-dev 2018-05-09 00:44:18 +00:00
Doris Ling
2f2d676897 Merge "Update arrow icon for see all apps." into pi-dev
am: 6bc31d343e

Change-Id: I56e43f5fc4d4647aaa695bc071141fe7dcb80107
2018-05-08 17:39:13 -07:00
Doris Ling
6bc31d343e Merge "Update arrow icon for see all apps." into pi-dev 2018-05-09 00:30:59 +00:00
Fan Zhang
9607dde41b Stop logging tether password in logcat & metrics provider
Change-Id: I7aaaf3148445bfb6c556ab37c6577da67dc94cbb
Fixes: 79419591
Test: adb logcat -b events | egrep "(sysui_|notification_)"
2018-05-08 16:31:47 -07:00
android-build-team Robot
218dff6173 Merge "Add back up message id for "Action not allowed"." into pi-dev am: c0edff7ffd
am: 4b118a3788

Change-Id: I29355e24dad7179c5cf430e860f6176cddcf42df
2018-05-08 16:27:38 -07:00
Lei Yu
e1f5bbc826 [automerger skipped] Merge "Fix crash in anomaly job service" into pi-dev am: db5c1cef71
am: d932e04ccd  -s ours

Change-Id: Ia949a5dcd8fb506672705042bda7f96a47cc2499
2018-05-08 16:22:19 -07:00
android-build-team Robot
4b118a3788 Merge "Add back up message id for "Action not allowed"." into pi-dev
am: c0edff7ffd

Change-Id: I4bfd6e2439ceafb5ed4567c6ead21c7ba8ead5e9
2018-05-08 16:10:34 -07:00
Lei Yu
d932e04ccd Merge "Fix crash in anomaly job service" into pi-dev
am: db5c1cef71

Change-Id: If2946b45ba2e7fe22f5cbd24fabfeb5ef1e4ee7d
2018-05-08 16:09:48 -07:00
android-build-team Robot
c0edff7ffd Merge "Add back up message id for "Action not allowed"." into pi-dev 2018-05-08 22:53:45 +00:00
Lei Yu
db5c1cef71 Merge "Fix crash in anomaly job service" into pi-dev 2018-05-08 22:52:59 +00:00
Lei Yu
adddc30c64 Update strings for summary tip.
1. Strings for the tip preference
2. Strings for the tip dialog

Change-Id: I59c371328ec735a0b22f707d440f3be85cf59c77
Fixes: 79171948
Test: Manual & RunSettingsRoboTests
2018-05-08 15:46:07 -07:00
Matthew Fritze
c301964167 Prevent crashes on null intent in Slice Builder
Change-Id: Ia429dd00fce785bc9d23ac8cf15f6855d7fca7c2
Fixes: 79147458
Test: Robotests
2018-05-08 15:37:42 -07:00
android-build-team Robot
6e0e48cc25 Merge "Remove demo-specific Developer Options logic" 2018-05-08 21:52:51 +00:00
yuemingw
3da2118260 Add back up message id for "Action not allowed".
Bug: 78443458
Test: manual
Change-Id: Ib93d8bf767be36323515ecb7cf496a6c234c06fe
2018-05-08 22:41:26 +01:00
Bill Yi
02d2f4b5e0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I60f5a1972ab0788573426988633195b41086d83c
2018-05-08 14:34:25 -07:00
Bill Yi
9fdd5ddcfb Import translations. DO NOT MERGE
Change-Id: Ie8955e994d1560cc56f6d3d077b4fdc48d36fba0
Auto-generated-cl: translation import
2018-05-08 13:55:11 -07:00
android-build-team Robot
714b15cbdf Merge "Use ListFormatter to join strings" 2018-05-08 20:20:28 +00:00
Christine Franks
986d02f03c Remove demo-specific Developer Options logic
Bug: 78654980
Test: make RunSettingsRoboTests

Change-Id: Ia0f3c10a6c73b3067a9f476af6e982e3ca60a46b
2018-05-08 19:50:49 +00:00
hughchen
f431088f9d Change the title when in call/media state
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/3909960 in
  master. Change android.support.* to androidx.*
* Change the title when in call/media state.
  Example: call state show "Available call devices"
           media state show "Available media devices"
* Use isAudioModeOngoingCall() utility function for checking if it is in call status
* Add register test to verify when in onStart() and onStop()
  the BluetoothCallback can be register and unregister.
* Add title string test to verify when in call or media state,
  the title can be changed to corresponding string

Bug: 78150641
Test: make -j40 RunSettingsRoboTests
Change-Id: I6be72cf0cae75525084ac3c5be8524c709f51f7d
2018-05-08 17:14:59 +08:00
Lei Yu
162c81e1d5 Fix crash in anomaly job service
If job has been stopped by any reason, we should cancel the background
thread, otherwise it will throw SecurityException when dequeuing from
JobParams.

This CL adds a lock to synchronize the method and stops dequeue work
if job has been canceled.

Change-Id: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Merged-In: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Fixes: 77968649
Test: RunSettingsRoboTests
2018-05-07 15:19:28 -07:00
android-build-team Robot
1220c364c4 Merge "Update Support and Tips setting title." into pi-dev am: e30007dcc0
am: 2cc1168d39

Change-Id: I9eeb3e34b88a9ff4fba7cda514d4f3f2f0dceafa
2018-05-07 12:20:56 -07:00
android-build-team Robot
2cc1168d39 Merge "Update Support and Tips setting title." into pi-dev
am: e30007dcc0

Change-Id: I3adf6f5f14d4aaf78054ce429ab7cfd1ff552fd3
2018-05-07 12:15:53 -07:00
android-build-team Robot
e30007dcc0 Merge "Update Support and Tips setting title." into pi-dev 2018-05-07 19:06:27 +00:00