Commit Graph

369492 Commits

Author SHA1 Message Date
kopriva
cce5e4f4a2 docs: bug 37127405, typo
Test: make ds-docs

Bug: 37127405

Change-Id: I40892ad7248d95a562d6af448ce4d475c79fd19f
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:09:04 -07:00
Andrew Solovay
a3e34fe9fe Merge "docs: Replacing {#link with {@link" into pi-dev 2018-10-04 20:06:59 +00:00
Andrew Solovay
a44f2c075b docs: Replacing {#link with {@link
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.

Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.

Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.

Staged to:

go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html

(Other files were not in the public Javadocs.)

Bug: 111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 18:20:51 +00:00
Wayne Lin
e193c54d84 [automerger skipped] resolve merge conflicts of 3afd4aed42 to oc-dr1-dev am: fd6df001e0 -s ours
am: 95fe3f8cba  -s ours

Change-Id: Ic6b0f8a9d64a9c19ff000ef76f2702327dfa9c64
2018-10-04 11:09:05 -07:00
Wayne Lin
95fe3f8cba [automerger skipped] resolve merge conflicts of 3afd4aed42 to oc-dr1-dev
am: fd6df001e0  -s ours

Change-Id: I9d9daffa893d91f9d524c851ba0935f87e085a05
2018-10-04 10:42:47 -07:00
Leo Hsu
42bae1bf5d Merge changes from topics "emergency-dialer-metrics", "telecom-metrics-for-emergency-dialer", "add_faster_emergency_dialer_flag" into pi-dev
* changes:
  Add extra data when starting emergency dialer intent
  Add new telecom metrics for emergency dialer
  Add new metrics constants for emergency dialer
  Separated emergency option final UI
  Fix Power menu background vanish
  Add separated emergency option on power menu
  Add emergency dialer option on power menu
2018-10-04 04:32:35 +00:00
TreeHugger Robot
58c7bcf12e Merge "docs: bug 37126744, typos" into pi-dev 2018-10-04 00:51:46 +00:00
Wayne Lin
fd6df001e0 resolve merge conflicts of 3afd4aed42 to oc-dr1-dev
Bug: 115331218
Bug: 112159033
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
2018-10-03 23:53:46 +00:00
TreeHugger Robot
7640a41654 Merge "docs: fixing several typos, bug 36941887" into pi-dev 2018-10-03 23:34:29 +00:00
kopriva
762a08fe90 docs: bug 37126744, typos
fixing order of import statements to clear repo hooks

Test: make ds-docs

Bug: 37126744

Change-Id: I0ebb3d1d2599a411afd9b8ffd6f2497d821deb2b
Exempt-From-Owner-Approval: Docs-only change
2018-10-03 16:13:19 -07:00
kopriva
2cb96ab8a1 docs: bug 37077993, object instead of array
also fixing import order to get past repo hooks

Test: make ds-docs

Bug: 37077993

Change-Id: I0a0d6338f714108eb632caacc6dda4b422dc697b
Exempt-From-Owner-Approval: Docs-only change
2018-10-03 14:14:13 -07:00
kopriva
c5fea19846 docs: fixing several typos, bug 36941887
Test: make ds-docs

Bug: 36941887

Change-Id: Id65c5a6b1cbb214ea46b13a6a68d667c819a2f60
Exempt-From-Owner-Approval: Docs-only change
2018-10-03 13:29:15 -07:00
Phil Weaver
3fbe56647c Merge "Fix a11y cache correctness bug" into pi-dev 2018-10-03 18:23:47 +00:00
TreeHugger Robot
37a944e883 Merge "Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled on a device" into pi-dev 2018-10-03 16:16:50 +00:00
Julia Reynolds
121e1f702c Merge "DO NOT MERGE Fix behavior of getNotificationChannelGroups" into pi-dev 2018-10-03 13:35:49 +00:00
TreeHugger Robot
1f050c6810 Merge "docs: bug 117112746, broken link" into pi-dev 2018-10-03 03:06:16 +00:00
Shaotang Li
37768436a2 Add extra data when starting emergency dialer intent
This data is used for emergency dialer metrics to determine where user
enters emergency dialer.

Bug: 112168722
Bug: 111378820

Test: manual
Change-Id: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
Merged-In: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
2018-10-03 02:59:56 +00:00
Shaotang Li
403675bd3c Add new telecom metrics for emergency dialer
These includes,
1. The source where user initiated the call.
2. The duration between START_CONNECTION and REQUEST_DISCONNECT.

Bug: 112168722
Bug: 111818008

Test: manual and check the result of
'adb shell dumpsys telecom' for metrics data
Change-Id: Iddc7f256362abe9fe252bd12cead05a7d77d329e
Merged-In: Iddc7f256362abe9fe252bd12cead05a7d77d329e
2018-10-03 02:59:42 +00:00
Shaotang Li
ebffdbd44d Add new metrics constants for emergency dialer
Bug: 112168722
Bug: 111378820

Test: build
Change-Id: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
2018-10-03 02:59:29 +00:00
Wesley.CW Wang
71db1f7601 Separated emergency option final UI
- Refine faster emergency icon.
 - Add ic_faster_emergency.xml to framework/core/res/drawable.
 - Remove faster_emergency_icon.xml from SystemUI/res/drawable.
 - Change emergency_icon.xml color to colorError.
 - Emergency option(India case) will follow separated option design if
 separated option feature is enabled.

Test: Manually,
use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show separated emergency option(default case),
use "adb shell settings put global emergency_affordance_needed 1" to show India emergency option(India case),
India emergency option will be separated button if feature is enabled,
otherwise it will be default design.
Change wallpaper to enable light/dark theme & check separated emergency option color.
(light theme color : D93025    dark theme color : E25142)

Bug: 112168722
Bug: 110658988

Change-Id: I2a3c5ce053aab05381806eedf108cec54af808b1
Merged-In: Id13bcb5b5242ded92b309667c5e2beb8694b9977
Merged-In: I2a3c5ce053aab05381806eedf108cec54af808b1
2018-10-03 02:58:38 +00:00
Wesley.CW Wang
3b0aa461b3 Fix Power menu background vanish
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
 - Let separated button use mSeparatedViewBackground & origin button use
 mListBackground to fix this bug.
 - Rename View mChild to mList.

Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.

Bug: 112168722
Bug: 111101759

Change-Id: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
Merged-In: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
2018-10-03 02:58:27 +00:00
Wesley.CW Wang
b44f2e5207 Add separated emergency option on power menu
- Add a separated button on power menu to launch emergency dialer.
 - Change HardwareUiLayout.java FrameLayout to LinearLayout, let it can
display separated button.
 - Add a flag to recognize separated button should show/hide, if
EmergencyAffordance(India) enabled, separated button will hide,
otherwise power menu will display separated button & power
menu last item won't get white background.

Test: Manually, use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show/hide separated emergency option, press emergency option will go to emergency dialer.
Change-Id: I1140fa412b655c16f3052cbabd118df278fd7f23
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: I1140fa412b655c16f3052cbabd118df278fd7f23

Bug: 112168722
Bug: 80376488
2018-10-03 02:58:13 +00:00
Wesley.CW Wang
36d9d5bc55 Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.

Test: Manually

Bug: 112168722
Bug: 80376488

Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: If359662a4d60dbe0ded89c3afe35db91dca4c445
2018-10-03 02:57:38 +00:00
TreeHugger Robot
d6301096ce Merge "docs: bug 37070633, wrong method name" into pi-dev 2018-10-03 02:38:13 +00:00
kopriva
b08f4649c4 docs: bug 117112746, broken link
Test: make ds-docs

Bug: 117112746
Change-Id: I7f0f99073edc13a0126fd6002eb254f8583d2655
2018-10-02 16:47:42 -07:00
kopriva
8cdc615ccd docs: bug 37070633, wrong method name
Test: make ds-docs

Bug: 37070633

Change-Id: I0e95ce9ac14f00395ddcd0c74bf450ff77178255
Exempt-From-Owner-Approval: Docs-only change
2018-10-02 16:02:39 -07:00
TreeHugger Robot
880aba2163 Merge "docs: fixing a couple of typos" into pi-dev 2018-10-02 21:17:21 +00:00
TreeHugger Robot
323a915bb3 Merge "docs: fixing typo, bug 37006473" into pi-dev 2018-10-02 21:13:28 +00:00
TreeHugger Robot
a4d4250f5b Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev 2018-10-02 20:30:17 +00:00
kopriva
b0cbd1637b docs: fixing typo, bug 37006473
also fixing an import statement that was blocking upload at repo hooks:
removed unused SystemApi import

Test: make ds-docs

Bug: 37006473

Change-Id: I2dec10fad213c4822631ad0f9c518a89d6c0c384
Exempt-From-Owner-Approval: Docs-only change
2018-10-02 12:51:17 -07:00
Todd Kopriva
7c5c4d1ca8 Merge "docs: bug 37130805, typo" into pi-dev 2018-10-02 19:03:29 +00:00
Stanley Tng
2bbcc6e976 Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Bug: 116317072
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
(cherry picked from commit 3d8dd1ae2c5b7aad91594062e53ef3bc2db7212e)
2018-10-02 10:17:49 -07:00
TreeHugger Robot
98d4d5002b Merge "Go via FgThread when starting the profiles during system boot." into pi-dev 2018-10-02 11:49:11 +00:00
Rafal Slawik
07b60cd4f5 Fix: read memory.stat from per-app cgroup only if per-app memcg are enabled on a device
Bug: 115601684
Change-Id: I91c1d4422e0492f19bd1e0fc821b597bd4ff1a7c
Merged-In: I91c1d4422e0492f19bd1e0fc821b597bd4ff1a7c
Fix: 115601684
Test: existing tests pass
(cherry picked from commit ba9440782c)
2018-10-02 11:45:55 +00:00
TreeHugger Robot
9c3f60d2f9 Merge changes from topic "hearing-aid" into pi-dev
* changes:
  Fix missing connection state changes intent for Hearing Aids
  Add Feature Flag for Hearing Aid Profile
  Prevent NPE when profile is null
  Add isConnectedHearingAidDevice function to check if it supports Hearing Aid profile
2018-10-02 00:53:40 +00:00
kopriva
6e5084164c docs: fixing a couple of typos
Test: make ds-docs

Bug: 37130920

Change-Id: Ic3d861624be12fd7967080a09a3f82d941d7e915
Exempt-From-Owner-Approval: Docs-only change
2018-10-01 15:54:49 -07:00
Brad Ebinger
18ee267409 Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev 2018-10-01 22:36:06 +00:00
TreeHugger Robot
46bdacd22f Merge changes from topic "language_filtering" into pi-dev
* changes:
  Use locale language instead of harcoded langauge
  Added new cell broadcast channels
2018-10-01 22:02:28 +00:00
kopriva
5ba798e9d1 docs: bug 37130805, typo
I fixed an extra 'and' while I was at it.

Test: make ds-docs

Bug: 37130805

Change-Id: Ia1e9a991f824253feca628022414f2e1fbdcfea8
Exempt-From-Owner-Approval: Docs-only change
2018-10-01 14:38:57 -07:00
Stanley Tng
c6f5643d96 Fix missing connection state changes intent for Hearing Aids
In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem. We need to check hearing aid
profile before updateLocalProfile().

Note: This has been totally fixed in master in refactoring code.

Bug: 116317072
Bug: 116044083
Bug: 116643085
Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.

Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
2018-10-01 13:39:38 -07:00
TreeHugger Robot
0b89c36e8a Merge "DO NOT MERGE Notifs sent from suspended apps should reappear" into pi-dev 2018-10-01 19:58:30 +00:00
TreeHugger Robot
1f86e2f4ca Merge "docs: bug 72853855, wrong parameter" into pi-dev 2018-10-01 18:18:46 +00:00
TreeHugger Robot
21155ef8bc Merge "docs: bug 72929620, nonoteslas typo" into pi-dev 2018-10-01 18:16:22 +00:00
TreeHugger Robot
6ee6799c03 Merge "docs: bug 112769174, unclosed parentheses" into pi-dev 2018-10-01 18:16:16 +00:00
TreeHugger Robot
bb2358dace Merge "docs: fixed broken link" into pi-dev 2018-10-01 18:15:42 +00:00
TreeHugger Robot
53b7ed70b5 Merge "docs: bug 37113731, correcting flag name" into pi-dev 2018-10-01 18:13:00 +00:00
Julia Reynolds
173a482b57 DO NOT MERGE Fix behavior of getNotificationChannelGroups
Which needs to return groups without channels when
called via NotificationManager.

Test: runtest systemui-notification
Change-Id: I2042e21f5cf0339e4cd828e6de8244df12ef3d88
Fixes: 115709729
2018-10-01 12:23:07 -04:00
Bill Yi
aba1abc62c Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev am: 57b2e38837 am: 6c2376ce80
am: a526511c79

Change-Id: Iddef019195dcf571656b68e00dd245b2db6cb812
2018-10-01 02:48:19 -07:00
Bill Yi
2643259cc6 [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 am: 0bc949205b -s ours am: 318224ae93 -s ours
am: 9577eeb9dc  -s ours

Change-Id: Ic9250b99ba5f09e3fc6a4e7f7792ae223e866cea
2018-10-01 02:40:39 -07:00
Bill Yi
0dda56ebfd Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev am: 33be0d800a am: e90b1d120c
am: 06908ed009

Change-Id: Ia9f82bf142fb7e168da1c14807e8d6b85bd13f32
2018-10-01 01:45:58 -07:00