android-build-team Robot
0e79a3a733
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9a1d318b37 -s ours
...
am: 09df358bd8
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
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
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
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
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
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
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
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
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
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
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
2018-05-08 17:57:04 -07:00
android-build-team Robot
171ec14458
Merge "Update strings for summary tip." into pi-dev
...
am: 0e7cff80ef
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
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
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
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
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
2018-05-08 16:10:34 -07:00
Lei Yu
d932e04ccd
Merge "Fix crash in anomaly job service" into pi-dev
...
am: db5c1cef71
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
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
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
Julia Reynolds
02489dd988
[automerger skipped] Merge "DO NOT MERGE DND settings redesign" into pi-dev am: e9211d58d2
...
am: 62491a2c82
2018-05-07 11:40:24 -07:00
Christine Franks
c463f19899
[automerger skipped] Merge "Add night display pref controllers and change UX" into pi-dev am: a1c70443be
...
am: c8ba60d90a
2018-05-07 11:38:19 -07:00
Julia Reynolds
62491a2c82
Merge "DO NOT MERGE DND settings redesign" into pi-dev
...
am: e9211d58d2
2018-05-07 11:33:29 -07:00
Christine Franks
c8ba60d90a
Merge "Add night display pref controllers and change UX" into pi-dev
...
am: a1c70443be
2018-05-07 11:30:59 -07:00
Julia Reynolds
e9211d58d2
Merge "DO NOT MERGE DND settings redesign" into pi-dev
2018-05-07 18:25:52 +00:00
Christine Franks
a1c70443be
Merge "Add night display pref controllers and change UX" into pi-dev
2018-05-07 18:20:25 +00:00
