Commit Graph

18064 Commits

Author SHA1 Message Date
Jim Miller
a507fc4b9e Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev am: fb8e9b9096
am: 8ad2bd4b53

Change-Id: Ic25a7a89485ec1791befafd4933a8cdd3741ce2e
2017-08-30 18:19:50 +00:00
Jim Miller
8ad2bd4b53 Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am: fb8e9b9096

Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212
2017-08-30 18:04:57 +00:00
TreeHugger Robot
fb8e9b9096 Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev 2017-08-30 17:47:46 +00:00
Jorim Jaggi
11b58a917c Add theme attribute for light navigation bar
Such that apps can set this in the theme and get a splash screen
that has a light navigation bar if requested.

Test: LightBarThemeTest
Change-Id: Iee93c49743f66ecad76e0a056ba16a1785f22784
Fixes: 62429332
2017-08-30 15:37:19 +02:00
Joachim Sauer
a59380177d Merge "Adapt ICU 59 API update to Doclava changes." am: e048261656 am: 0fc0cc9dd8
am: 02b2b3d703

Change-Id: I09d38e6ed0426bc826722c1cdb5e7c79cf90adb6
2017-08-29 14:16:18 +00:00
Joachim Sauer
0fc0cc9dd8 Merge "Adapt ICU 59 API update to Doclava changes."
am: e048261656

Change-Id: Iea671a7029e083bffee2bcaacfaa0df41f45c1cc
2017-08-29 13:54:14 +00:00
Joachim Sauer
e447d9f0fb Adapt ICU 59 API update to Doclava changes.
Add methods that were missing from the previous API update because the
update-api version used for that had different behaviour from the
current one.

Specifically overrides for methods that differ only in sychronization
are now considered API-worthy and weren't before (b/62576297).

All methods added in this commit are methods that exist in the base
class without synchronization and are synchronized in the class they are
now being added in.

Bug: 64807220
Test: m checkapi
Change-Id: I9bf1b3d02e6a8f04b93ec36c0adffb7eedad3ad3
Merged-In: Iff584fb72dc8d651f9482b573f4b8cec89840ca6
2017-08-29 11:26:29 +01:00
Michael Wright
1a6585fc20 Merge "O MR1 is API 27" into oc-mr1-dev am: d489d122f4
am: 800af77f9c

Change-Id: If3e76e14e60573d8f2e188abd95e3ef634eda3a2
2017-08-26 02:53:45 +00:00
Michael Wright
800af77f9c Merge "O MR1 is API 27" into oc-mr1-dev
am: d489d122f4

Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df
2017-08-26 02:41:46 +00:00
TreeHugger Robot
d489d122f4 Merge "O MR1 is API 27" into oc-mr1-dev 2017-08-26 02:29:51 +00:00
TreeHugger Robot
2e41218797 Merge "Adding group divider support in Android Menus" 2017-08-25 23:33:17 +00:00
Michael Wright
f9c1757836 Merge "Add new system API for stable display size" into oc-mr1-dev am: c217d744b4
am: 9d9693e4af

Change-Id: I687f303f8d92be5ec0604761fa785fc20612633a
2017-08-25 21:21:13 +00:00
Michael Wright
9d9693e4af Merge "Add new system API for stable display size" into oc-mr1-dev
am: c217d744b4

Change-Id: I25a68c0bf9eecd1dbe878851a62926520d4ea71a
2017-08-25 21:02:36 +00:00
Michael Wright
eedcbf1504 Add new system API for stable display size
Fixes: 34388294
Test: manual
Change-Id: Ie380230bbd82370f507161b4cdb6f0d100b09f11
2017-08-25 20:56:00 +00:00
Tarun Lohani
0b842b465e Adding group divider support in Android Menus
Added a divider view in popup_menu_item_layout.
Hiding divider where they are not required in MenuAdapter.

Bug: 32172964
Test: Added test method testGroupDividerEnabledAPI to PopupMenuTest.java
Change-Id: I9cf0e9a72f085336e9f136a7ed17aead0e30760c
2017-08-25 20:18:11 +00:00
Alex Klyubin
bb2bd9fb9a Merge "Delete android.net.PskKeyManager" 2017-08-25 19:44:14 +00:00
Shuo Qian
782395561d Merge "Add new error code in SmsManager"
am: 387ed22fef

Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72
2017-08-25 18:15:12 +00:00
Shuo Qian
387ed22fef Merge "Add new error code in SmsManager" 2017-08-25 18:01:18 +00:00
Tyler Gunn
a4a789802a Merge "Track conference start in system elapsed time." am: 3b166fba8a am: 49042dc67c
am: 55967b462c

Change-Id: I5a7561dd09405bcdc38926bd331f5ffd8019ec2f
2017-08-24 23:20:14 +00:00
Tyler Gunn
49042dc67c Merge "Track conference start in system elapsed time."
am: 3b166fba8a

Change-Id: I8b78aaa447adcc1bfce0fec8f50857daa37d0575
2017-08-24 22:58:02 +00:00
Tyler Gunn
3b166fba8a Merge "Track conference start in system elapsed time." 2017-08-24 22:24:16 +00:00
Shuo Qian
bf1a674ed7 Merge "Add new error code in SmsManager" into oc-mr1-dev am: 1dafcc89a5
am: a43b382766

Change-Id: Ic1a8824e1f1d2e3a7655484d23ff658d3d5fd40d
2017-08-24 22:02:47 +00:00
Yohei Yukawa
c6f9b06164 Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff
am: b737076a4e

Change-Id: I94a90ce699c420f6f761f55c31967ea407e1e8c5
2017-08-24 21:57:08 +00:00
Shuo Qian
a43b382766 Merge "Add new error code in SmsManager" into oc-mr1-dev
am: 1dafcc89a5

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
2017-08-24 21:44:54 +00:00
sqian
85bb4b35f1 Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
Merged-In: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-24 14:40:59 -07:00
Shuo Qian
1dafcc89a5 Merge "Add new error code in SmsManager" into oc-mr1-dev 2017-08-24 21:22:31 +00:00
Yohei Yukawa
b737076a4e Merge "New haptic feedback constants" into oc-mr1-dev
am: f3b78305ff

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
2017-08-24 21:14:36 +00:00
Tyler Gunn
b18835d453 Merge "Track conference start in system elapsed time." 2017-08-24 19:56:50 +00:00
Roozbeh Pournader
c4c3a0f5a9 Merge "Support fallback linespacing in DynamicLayout" 2017-08-24 18:38:00 +00:00
Yohei Yukawa
262dadf870 New haptic feedback constants
This CL introduces several haptic feedback constants that are ready
to be exposed to developers.

Test: checkbuild
Fixes: 64537070
Change-Id: If54d5bc6cab4e2c405615b7a40648c74a1097ea3
2017-08-24 10:51:00 -07:00
Roozbeh Pournader
612e67323f Merge "Add a builder for DynamicLayout and switch TextView to it" 2017-08-24 17:39:14 +00:00
Jim Miller
a8bc97cd70 Add a constant to allow system-provided fingerprint dialogs
This adds FINGERPRINT_ERROR_USER_CANCELED to the list of possible errors
returned by FingerprintManager.authenticate().

Fixes b/64540509

Test: documentation builds

Change-Id: I66b46d385ab10eb0bc8e982c06e7a60570a79165
2017-08-23 18:21:21 -07:00
Roozbeh Pournader
15b213d556 Support fallback linespacing in DynamicLayout
Bug: 28963299
Test: bit FrameworksCoreTests:android.text.
Change-Id: I132499d5927b26fb45522ffee99bac12aca3721f
2017-08-23 16:34:25 -07:00
Roozbeh Pournader
22a167cac8 Add a builder for DynamicLayout and switch TextView to it
The builder mostly copies the structure and the logic of
StaticLayout.

We also improve various parts of code and documentation in
StaticLayout's builder.

Bug: 28963299
Test: bit FrameworksCoreTests:android.text.
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Test: bit CtsTextTestCases:*
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Change-Id: I5c4a6e031bd0f41f765a3d85e0b9b7e9be42ad4b
2017-08-23 15:05:06 -07:00
Tyler Gunn
b2f875bc54 Track conference start in system elapsed time.
This is important so that Telecom can track the duration of the call,
which is tracked using wall clock time.

Test: Manual, unit test
Bug: 64068300
Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
2017-08-23 14:47:31 -07:00
Michael Wright
eec01ac5a3 O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I4be170f9f1021899db3ef0bce3eaeada21f8b475
2017-08-23 13:49:14 -07:00
Hall Liu
4c154ed2c9 Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694 am: a7bb0ffc7d
am: c04df54cfc

Change-Id: Ie23fae4840c7d944d43a6040d3bb09aa3ccd5b76
2017-08-23 17:28:36 +00:00
Hall Liu
c04df54cfc Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
am: a7bb0ffc7d

Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577
2017-08-23 17:16:04 +00:00
Hall Liu
a7bb0ffc7d Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc
2017-08-23 17:05:57 +00:00
Hall Liu
7754e25694 Merge "Embms API adjustments for 7/21" am: 489dcb7cca
am: 488d3bf786

Change-Id: I03ca7bd2734b5410c37b23ba2e8d33d722ad7ebf
2017-08-23 16:56:26 +00:00
Hall Liu
d5c955fcdc Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-22 17:07:48 -07:00
Nate Fischer
0d2b68bb68 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev am: b2456e6194
am: 0cd12a83c6

Change-Id: I5c0529021e6bbba15090bfc500bb4610a9a4c0d7
2017-08-22 23:21:15 +00:00
Nate Fischer
0cd12a83c6 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
am: b2456e6194

Change-Id: I3066dd0edd6c125b2e7fdab7fc07624f4c8688a5
2017-08-22 23:01:12 +00:00
Nate Fischer
b2456e6194 Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev 2017-08-22 22:40:39 +00:00
sqian
724f621daa Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-22 14:51:03 -07:00
Tyler Gunn
3fa819c2f3 Track conference start in system elapsed time.
This is important so that Telecom can track the duration of the call,
which is tracked using wall clock time.

Test: Manual, unit test
Bug: 64068300
Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
2017-08-22 13:39:31 -07:00
Hall Liu
295291872b Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444 am: 23566e82dd
am: a0936c7b89

Change-Id: Ida377fd6b23e208728895a70fcffca489bc5086e
2017-08-22 19:20:08 +00:00
Hall Liu
a0936c7b89 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444
am: 23566e82dd

Change-Id: I5308524da670b829ef8da474bfaee5d60caa6d86
2017-08-22 19:07:06 +00:00
Hall Liu
23566e82dd Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
am: 0d73e03444

Change-Id: I5c5a8b6247ef844f86880cf4b162527d699e2fc9
2017-08-22 18:53:34 +00:00
Hall Liu
0d73e03444 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1
am: ac9893bba0

Change-Id: I0ae2ee130deb1d84cc9e343e9764f65ba46d3fd1
2017-08-22 18:44:53 +00:00