Commit Graph

60734 Commits

Author SHA1 Message Date
Meng Wang
faf4843b99 Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216c5" into nyc-mr1-dev-plus-aosp
am: f71eae2644

* commit 'f71eae2644ce2f8c3b1227df91248637f0231257':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ie2ffd247f9803b822c9cdd4080edfcfe6a18e9b9
2016-05-20 22:33:22 +00:00
Meng Wang
fe9ed66227 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
2016-05-20 22:21:26 +00:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Seigo Nonaka
0696b9ae90 Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 18bf0e2ad2
am: 461e71472d

* commit '461e71472df1942936c27fb65f46b72c3eb4ab1b':
  Clear locales without changing layout direction.

Change-Id: I0db0a2e72765632803a17dce56857207ffc146e9
2016-05-20 20:08:39 +00:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
2016-05-20 20:00:39 +00:00
Seigo Nonaka
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
2016-05-20 19:52:55 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
2016-05-20 19:52:54 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Siyamed Sinir
0923b063c4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 8ae06f6f3a
am: 68d3077e9a

* commit '68d3077e9a11c96d118834563fa283b3ead4f1a7':
  setTransformationMethod should reset mTextDir

Change-Id: I46a1f5e356992bd08ba440fce0e15b952541d547
2016-05-20 18:07:06 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
2016-05-20 18:02:39 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
2016-05-20 17:59:35 +00:00
Siyamed Sinir
8ae06f6f3a Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I47699dc6e8c8fdddd91db2c4590a5244403c5f5c
2016-05-20 17:53:50 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
2016-05-20 17:53:44 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Christopher Tate
39b1dd9ec8 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: 36b03ec9f0
am: 1500a27af2

* commit '1500a27af2e4daede64b938cf4207748c283654a':
  Back up / restore the 'mono audio' setting

Change-Id: I6ba6bec20b5be767cd8b97b4ac1fb022ff9be0a5
2016-05-20 17:30:19 +00:00
Chris Tate
1500a27af2 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25
am: 36b03ec9f0

* commit '36b03ec9f0cd6466f2bd9517a72438e446033685':
  Back up / restore the 'mono audio' setting

Change-Id: I0947760de027c0dfa1fd5f66ea7adfcae9d965a0
2016-05-20 17:16:25 +00:00
Christopher Tate
d33151bf4f Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
2016-05-20 17:11:10 +00:00
Christopher Tate
36b03ec9f0 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c
2016-05-20 17:11:07 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
Siyamed Sinir
d55be2b9d5 setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.

Bug: 28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
2016-05-19 18:30:38 -07:00
Ta-wei Yen
427bfc0842 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp
am: 48fcac0445

* commit '48fcac0445741a9c4ba3bee60a5c41758c9b4068':
  Hide VoicemailContract.setQuota()

Change-Id: I236f788a0ee0e1bca73163108f055d15c7a33050
2016-05-20 01:23:22 +00:00
Ta-wei Yen
1d7c21fdb3 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 621b68a213
am: f652b1ec42

* commit 'f652b1ec426b0d8141cd5860a8ddd0985cb1c08b':
  Rename visual voicemail sync intent value

Change-Id: I3769f7a4958eae52047dc276b96939a73418d1ac
2016-05-20 01:19:35 +00:00
Ta-wei Yen
df858672ba Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913
am: 93ad8c6b2f

* commit '93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
  Hide VoicemailContract.setQuota()

Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
2016-05-20 01:14:01 +00:00
Ta-wei Yen
f652b1ec42 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
  Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
2016-05-20 01:11:34 +00:00
Ta-wei Yen
ba9b910bbc Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
2016-05-20 01:07:56 +00:00
Ta-wei Yen
93ad8c6b2f Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: Ifc1365650a981130a376ef253e96331595475510
2016-05-20 01:07:52 +00:00
Ta-wei Yen
7220c75f65 Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
2016-05-20 01:06:04 +00:00
Ta-wei Yen
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
2016-05-20 01:06:03 +00:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00
Christopher Tate
ea2d6e8e89 Back up / restore the 'mono audio' setting
Bug 28437565

Change-Id: I6028886eb1aa424edabca65ad9d11d984b82d198
2016-05-19 16:55:49 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Abhijith Shastry
4ced2b0732 Merge "Update BlockedNumberContract javadocs." into nyc-dev am: 07abc7f813
am: 99d1fd935e

* commit '99d1fd935e7d8c8f3b27c41d1a7ebe7ffa0dbe63':
  Update BlockedNumberContract javadocs.

Change-Id: I7bf4ac0a54b69fb2c4084eeac3de2f7de94b102a
2016-05-19 22:50:34 +00:00
Abhijith Shastry
99d1fd935e Merge "Update BlockedNumberContract javadocs." into nyc-dev
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: Id8d90f28d56223ab1d01be634e83df2ee4dd9e93
2016-05-19 22:46:57 +00:00
Abhijith Shastry
cd44b983fe Merge "Update BlockedNumberContract javadocs." into nyc-dev
am: 07abc7f813

* commit '07abc7f8139e012f8a92d74448db357446ab4664':
  Update BlockedNumberContract javadocs.

Change-Id: I88cd7749894dc531fb793e800528af7a686076f5
2016-05-19 22:46:55 +00:00
Abhijith Shastry
07abc7f813 Merge "Update BlockedNumberContract javadocs." into nyc-dev 2016-05-19 22:43:12 +00:00
Phil Weaver
ea45ad0c08 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d
am: f2b72b3a9d

* commit 'f2b72b3a9d1576da77cfe1f7c38648c2c4e90314':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ic796c5149995c616e3d57b9ebf1f6d9f288dc07c
2016-05-19 22:04:01 +00:00
Phil Weaver
df5056d531 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1
2016-05-19 21:57:55 +00:00
Phil Weaver
f2b72b3a9d Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ie5bfa1fcee7ec463190ef73311f20f3a6f087e82
2016-05-19 21:57:12 +00:00
Phil Weaver
227d33439d Merge "Fix a11y crash when window layer isn't unique." into nyc-dev 2016-05-19 21:50:29 +00:00
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
2016-05-19 22:11:37 +01:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
2016-05-19 20:54:37 +00:00
Selim Cinek
b9d4cd81a3 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: Ib495f096b5b2bc758ce7224fae33ba1a44c027a2
2016-05-19 20:51:04 +00:00
Selim Cinek
0f27eeba1b Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev am: 0676196be2
am: 8e8aa4ec4d

* commit '8e8aa4ec4daa5ac46e9be921bc0dd34f812e1a97':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: Ibaf35c283513973a22dee6eb601493b01a5de573
2016-05-19 20:50:20 +00:00
Selim Cinek
e9b32c77f8 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: I8caf83fdb4a27e477e644123d349bc4951eda0dd
2016-05-19 20:49:24 +00:00
Selim Cinek
8e8aa4ec4d Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev
am: 0676196be2

* commit '0676196be2657fdf265fa7ad1eae3eecf1bbfebc':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: I16327b27bcfce8eaeb18cbddd420bb134cff1e45
2016-05-19 20:45:20 +00:00
Selim Cinek
b521c107ed Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev
am: 0676196be2

* commit '0676196be2657fdf265fa7ad1eae3eecf1bbfebc':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: Idd72e636e42f59a17445694b4c4c97b47bf58e71
2016-05-19 20:45:18 +00:00
TreeHugger Robot
2486cb2c89 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev 2016-05-19 20:40:26 +00:00
TreeHugger Robot
0676196be2 Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev 2016-05-19 20:39:34 +00:00
Phil Weaver
adaafb2980 Fix a11y crash when window layer isn't unique.
TalkBack is seeing crashes that I can only explain by our assumption
that window layer is unique in all cases. TalkBack reports that it
happens during animation, so I assume that the layer may repeat
transiently.

Reducing our dependence on this assumption by traversing the list of
windows sorted by layer without assuming that the list has the same
length as the list of unsorted windows.

Also documenting the undefined behavior of SparseArray when indexing
beyond its bounds. The undefined behavior itself is intentional for
performance reasons.

Bug: 28679528
Bug: 28815817
Change-Id: I0c9f90b0b458b4cde465f603ba204fe6691e5c2c
2016-05-19 13:32:24 -07:00