drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
314,910 Commits 1 Branch 0 Tags
Commit Graph

2165 Commits

Author SHA1 Message Date
Baligh Uddin
f17950e962 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I2e883f6dd637c5cbd3bf17bb6f73946f8793fd44
 2016-05-21 18:24:43 -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
Steve McKay
a1f7505fb6 Merge "Fix RTL issue in delete dialog." into nyc-dev 
am: 7b5327fb67

* commit '7b5327fb67765769adc6cb0b2de21034a30cf24d':
  Fix RTL issue in delete dialog.

Change-Id: Ic55b0e756df55859318ae748073b0c85c3cade3e
 2016-05-19 20:31:46 +00:00
Steve McKay
0264097200 Merge "Fix RTL issue in delete dialog." into nyc-dev 
am: 7b5327fb67

* commit '7b5327fb67765769adc6cb0b2de21034a30cf24d':
  Fix RTL issue in delete dialog.

Change-Id: I4351e7da5c8643e5099c70472e1de1a49fcc025b
 2016-05-19 20:31:46 +00:00
TreeHugger Robot
7b5327fb67 Merge "Fix RTL issue in delete dialog." into nyc-dev 2016-05-19 20:24:35 +00:00
Steve McKay
78951ad998 Fix RTL issue in delete dialog. 
Bug:28772371
Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966
 2016-05-19 11:21:41 -07:00
TreeHugger Robot
7b81841162 Merge "Convert ItemDragListenerTest to JUnit4, and add it to APCT." 2016-05-19 01:34:53 +00:00
Garfield, Tan
ad02945b8b Convert ItemDragListenerTest to JUnit4, and add it to APCT. 
Change-Id: I45fd0c64154710e39dd8c0f43362f74eda11e3fc
(cherry picked from commit 5413e81c8e9ca94da2c792403ae8c072535d95b2)
 2016-05-19 00:21:00 +00:00
Garfield, Tan
ab7b37214f Enable debug logging. 
Change-Id: Ie891efdda96a97286fd22348903e93b36a2a6e83
(cherry picked from commit fbb4e79a06ca02f2aa02724e3e9bd4134a8e515d)
 2016-05-18 23:47:37 +00:00
Baligh Uddin
d4e70720ef Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:35 +00:00
Ben Lin
fa833c3d65 Merge "Initial effort toward fixing Suppress tests by integration of Espresso." 2016-05-18 01:13:41 +00:00
Garfield, Tan
a9d424ab97 Open root list when hovering on the edge in drawer layout. 
Bug: 28345294

Change-Id: Ia569003e21aea0641ccc1d2a5e042bdc93f32bb3
(cherry picked from commit 49eda9885e81a32f8a3d7cc7b9f9f15766b2621e)
 2016-05-17 21:55:13 +00:00
Garfield, Tan
c9af00d40b Use thumbnail of other sizes if it's missing in current size. 
Bug: 26881628

Change-Id: Id7aa6f5c8c1a415f7dd97143a088ba89fae43eea
(cherry picked from commit 614eef86e8ce6dd462e2f91ef5c705dc62bb7c7f)
 2016-05-17 18:01:12 +00:00
Baligh Uddin
0c931d6f80 Import translations. DO NOT MERGE 
Change-Id: If114c25440347c1fb96059eb7531dac999d88fcc
Auto-generated-cl: translation import
 2016-05-16 15:19:18 -07:00
Baligh Uddin
474bbe75c6 Import translations. DO NOT MERGE 
Change-Id: Ie2093912a314d30d88818d983c34d77925ec7051
Auto-generated-cl: translation import
 2016-05-16 15:13:35 -07:00
Ben Lin
da75c243d5 Initial effort toward fixing Suppress tests by integration of Espresso. 
Bug: 27533946
Change-Id: I0286ff6d4c53b464180e3100b7219e766ca09de3
(cherry picked from commit 80c050b656030e070f27708bc4da5f5c7fc6cac6)
 2016-05-16 20:45:40 +00:00
Baligh Uddin
5d92d35e6a Import translations. DO NOT MERGE 
Change-Id: I7f0ef1b102e8489d95d91f481897c99c70d73bb3
Auto-generated-cl: translation import
 2016-05-16 12:52:53 -07:00
Steve McKay
935d7d6854 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf 
am: b8995b7abc

* commit 'b8995b7abc9cbaa1dcb363c68535a63f4e8768a3':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I54d288582f474ed1a0718a3f6327af7f1814be75
 2016-05-13 17:42:44 +00:00
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev 
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
 2016-05-13 17:31:35 +00:00
Steve McKay
270539c6d0 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev 
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I3e7b11561ad3d6a3407119428a2e20709072f53a
 2016-05-13 17:31:32 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Ben Lin
c8e00fee20 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 am: 6974295274 
am: ff23546c2c

* commit 'ff23546c2ca46335cfe0335f72c39f4709c6eebe':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: Ibf8070a47c2a0e14bd4eb24b322dfebb7c019675
 2016-05-11 17:50:06 +00:00
Ben Lin
6974295274 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

* commit 'f2413b79c6e8f0b23b84c08806cca9c8c01959b5':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I497f0822da0d42d59b025623e61167aa5d157396
 2016-05-11 17:44:05 +00:00
Ben Lin
10601fa8bd Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

* commit 'f2413b79c6e8f0b23b84c08806cca9c8c01959b5':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: I9c2af4839ceb15559f8ff5154c84bb03442a441b
 2016-05-11 17:44:05 +00:00
Ben Lin
f2413b79c6 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 2016-05-11 17:36:26 +00:00
Ben Lin
ba92ba5cc3 Merge "Add support for search in DownloadManager." 2016-05-10 23:32:03 +00:00
Steve McKay
f570c771f2 Don't show new-window item in Downloads per Gabe. 
Also, fix regression...don't show "internal storage" option in Downloads.
All other modes, fix inconsistencies in presentation of
internal-storage/new-windows commands by eliminating launch mode inference.
Update VolumeInfo and MTP provider to send correct launch mode extra.

Bug: 28691735,28695347
Change-Id: Ic480925f4c8f1beee4da104a2259c1ce5f28a6a1
 2016-05-10 16:25:58 -07:00
Ben Lin
ce763d8bac Add support for search in DownloadManager. 
Bug: 26524617
Change-Id: I41c0f92381bec8ad06db73b25ec67466f368b55c
 2016-05-10 21:45:25 +00:00
Garfield, Tan
1d975315b9 Add capability to spring load a root or directory. 
Bug: 28242270
Change-Id: I5cbdb7734af8d78015a82fd7b38b1266576c9914
(cherry picked from commit b5e2714d63dc5e74cef69f590b41a161eeca7b80)
 2016-05-10 20:39:49 +00:00
Delphine Martin
ce528bba46 Merge "Set jack.assert.policy value to \'always\'" into nyc-dev 
am: 1100edb83f

* commit '1100edb83fd8099609ffed9ea1290f95d15f7ca0':
  Set jack.assert.policy value to 'always'

Change-Id: Ic8f3b6ae889a4e10a20d11ba6345a49920d9f364
 2016-05-10 16:32:36 +00:00
Delphine Martin
26ef8c0fdf Merge "Set jack.assert.policy value to \'always\'" into nyc-mr1-dev-plus-aosp 
am: 13daf5583e

* commit '13daf5583e8408315cacfc554777d091f0662ab3':
  Set jack.assert.policy value to 'always'

Change-Id: I3e9e8c620a4a4478186bca5a6e445bc4e62b96e4
 2016-05-10 16:19:46 +00:00
Delphine Martin
355421460b Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

(cherry-picked from 2a6b5c63c04b819950cec466c8bb6da61270af22)

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 15:35:06 +00:00
Delphine Martin
d90f6d3772 Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

(cherry-picked from 2a6b5c63c04b819950cec466c8bb6da61270af22)

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 15:33:42 +00:00
Delphine Martin
2a6b5c63c0 Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 14:42:33 +00:00
Steve McKay
793b8c4a8d Merge "Don\'t persist selection after restore." into nyc-dev am: 522a437786 am: fd5affdc2c 
am: 9e3ed23fd0

* commit '9e3ed23fd01f7e85d9fbcfcad4ef2b68f72e2274':
  Don't persist selection after restore.

Change-Id: I1b9beb7ab84c8bba9d94f388234235b1ad7c565d
 2016-05-06 22:32:53 +00:00
Steve McKay
fd5affdc2c Merge "Don\'t persist selection after restore." into nyc-dev 
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: I9f9be7b8a5ffc0a3374cef0902ffeeee2add6d91
 2016-05-06 22:22:42 +00:00
Steve McKay
391d3d5b5e Merge "Don\'t persist selection after restore." into nyc-dev 
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: Idee08d4397212a2a2a58b650ebcaa3b162b73aab
 2016-05-06 22:22:41 +00:00
TreeHugger Robot
522a437786 Merge "Don't persist selection after restore." into nyc-dev 2016-05-06 22:11:14 +00:00
Ben Lin
ae00a14ae3 Removed duplicate call to Metric log, and using private logging method. 
Bug: 28554140
Change-Id: I071c50ef5b51de65e71b85453cf83acae5ad6af7
 2016-05-06 12:32:15 -07:00
Steve McKay
99544dd0f4 Don't persist selection after restore. 
Bug: 28469988
Change-Id: I1fec774d8ebdec13b33262d7fe8e17fccd84b657
 2016-05-06 12:27:49 -07:00
Steve McKay
ea9092fdbf Merge "Fix regression, show internal storage option..." into nyc-dev am: 9a76143ef5 am: 20898f682b 
am: 5fa1f50f01

* commit '5fa1f50f0179313d32ec59d7949884be6801b17d':
  Fix regression, show internal storage option...

Change-Id: I8f21a54839c594f16c3e4cec58f3de7e0881b852
 2016-05-06 15:29:34 +00:00
Steve McKay
77b964ce7f Merge "Fix regression, show internal storage option..." into nyc-dev 
am: 9a76143ef5

* commit '9a76143ef550a547aefed81acbad5d380cc33393':
  Fix regression, show internal storage option...

Change-Id: Iccbaa87826350a9ac10a0b852dc793bc222f20de
 2016-05-06 15:19:07 +00:00
Steve McKay
20898f682b Merge "Fix regression, show internal storage option..." into nyc-dev 
am: 9a76143ef5

* commit '9a76143ef550a547aefed81acbad5d380cc33393':
  Fix regression, show internal storage option...

Change-Id: I70003518063b682b15b50bc075a923ae96815af2
 2016-05-06 15:19:05 +00:00
Steve McKay
5acf1ac2ab Fix regression, show internal storage option... 
...for non "Downloads" scenarios like "Copy to".
Bug: 28552420

Change-Id: If317e3f575a40cac69628c1b6eecfc6be1dfcbce
 2016-05-05 14:38:55 -07:00
Steve McKay
da0755ee8f Merge "Finish selection mode after copyto and share..." into nyc-dev am: 94e3b80d5b am: 6818cd5540 
am: f9cb0774fb

* commit 'f9cb0774fbc3d40d8ec03f0a519f4f646d24d5ed':
  Finish selection mode after copyto and share...

Change-Id: Ic896d181603be626c17edee5f0d6f7abebd918b1
 2016-05-04 22:30:46 +00:00
Steve McKay
f9cb0774fb Merge "Finish selection mode after copyto and share..." into nyc-dev am: 94e3b80d5b 
am: 6818cd5540

* commit '6818cd554050152821175eb3d429275e6cc3267d':
  Finish selection mode after copyto and share...

Change-Id: I2d52ff873397d59bddd0bd6a135a88c3c1b503c3
 2016-05-04 21:55:06 +00:00
Steve McKay
d67e16af40 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

* commit '94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
  Finish selection mode after copyto and share...

Change-Id: Ie856df59740386cd3df6efdd39ff08983bfc0eb7
 2016-05-04 21:37:43 +00:00
Steve McKay
6818cd5540 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

* commit '94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
  Finish selection mode after copyto and share...

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
 2016-05-04 21:37:39 +00:00
TreeHugger Robot
94e3b80d5b Merge "Finish selection mode after copyto and share..." into nyc-dev 2016-05-04 20:58:39 +00:00
Steve McKay
14380378a7 Merge commit \'1d8b98b\' into fixMerge 
am: 01b21d8be8

* commit '01b21d8be8fcd961ae7063e462f265d32c62aee2':
  Disable share when dirs selected.

Change-Id: I8335e71b05f20018c43641eebb21754aa9664ccc
 2016-05-04 20:38:42 +00:00