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

1820 Commits

Author SHA1 Message Date
Colin Cross
3c2c2764d4 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2 
am: 313e645801

Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f
 2017-02-17 22:25:53 +00:00
Colin Cross
062d1d5b16 Add missing transitive dependencies 
Add android-support-transition to DocumentsUI for
android-support-design, android-support-annotations to
ExternalStorageProvider for android-support-documents-archive, and
android support libraries to SettingsLib/common.mk.

Test: builds
Merged-In: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
Change-Id: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
 2017-02-16 17:34:29 -08:00
Paul Duffin
c02f6bb64b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45 
am: 9250814fd2

Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
 2017-02-08 20:18:34 +00:00
Paul Duffin
9250814fd2 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a 
am: 9e99b9ee45

Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8
 2017-02-08 18:30:17 +00:00
Paul Duffin
3e5fbca0c5 Replace com.android.internal.util.Predicate with java.util.function.Predicate 
Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
 2017-02-07 16:57:54 +00:00
Steve McKay
1552895f55 DO NOT MERGE: Allow launcher icon to be config'd in overlay. 
am: 24cd592b24

Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
 2017-01-26 04:35:46 +00:00
Steve McKay
24cd592b24 DO NOT MERGE: Allow launcher icon to be config'd in overlay. 
Bug: 34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
 2017-01-25 20:41:14 +00:00
Paul Duffin
43267b4b9e Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8 
am: 56a2ae1056

Change-Id: I0ede6895eb25f72a74af3ac4431a21960500bec5
 2017-01-19 11:49:28 +00:00
Paul Duffin
56a2ae1056 Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 
am: ab62fd67d8

Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
 2017-01-19 11:44:56 +00:00
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets 
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
 2017-01-19 09:43:05 +00:00
Tamas Berghammer
24d8553316 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" 
This reverts commit cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
 2017-01-18 19:33:22 +00:00
Tamas Berghammer
cbd3f0c59a Update package names to work with the proto3 compiler 
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc3a4a615faf249bf4f126f42e80b82e)
 2017-01-11 11:27:38 +00:00
Ben Lin
7ef13276c1 DO NOT MERGE Using Activity#setTitle to have TalkBack announce root traversal. 
am: ab58b5a3dd

Change-Id: Id9c2e3ff42a2ec8fe554e5d3d830d2d70d107086
 2016-12-13 21:15:15 +00:00
Ben Lin
ab58b5a3dd DO NOT MERGE Using Activity#setTitle to have TalkBack announce root 
traversal.

Bug: 32260739
Bug: 28275570
Change-Id: Ie3711e8ccbf588838a3f21346f317243516382bd
 2016-12-13 11:32:05 -08:00
Ben Lin
98e58262d2 DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal." 
This reverts commit 4c80659e99b182492a4719560180079d23c1b338.

Change-Id: Id5fa68f37170e61e2e63fdb3a60e8a3db79c81fa
 2016-12-13 19:06:51 +00:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger 
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
 2016-11-22 17:19:45 -08:00
Bill Yi
149b6ede65 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ia40da4b009f43aa51b2b7d3acdccc7552e2b35d0
 2016-11-20 13:52:54 -08:00
Ben Lin
4c80659e99 DO NOT MERGE ANYWHERE 
Using Activity#setTitle to have TalkBack announce root traversal.

Bug: 32260739
Bug: 28275570
Change-Id: I3b2b7c017d0c899fbccc8bc9b92453e715329317
 2016-11-18 14:35:22 -08:00
Felipe Leme
7e45541244 DO NOT MERGE ANYWHERE - Clear preferences when package is removed. 
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).

Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug: 30900628
Bug: 28722556
Fixes: 32972310
(cherry picked from commit 20488d97cdc9aa7e98f6fd75c2890ba18781654a)
 2016-11-18 18:33:39 +00:00
Bill Yi
377d4af0d0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32766034
Change-Id: I7d27891f4b452f54e6f14d22f37b6b2bcbdefc5b
 2016-11-10 02:24:31 -08:00
Bill Yi
4d67c3b986 Import translations. DO NOT MERGE 
Change-Id: Id49e895ef1a65186b5fd86a156a639162bc83889
Auto-generated-cl: translation import
 2016-11-04 19:47:41 -07:00
Garfield Tan
706530bd88 DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. am: d91dd17f36 
am: cc6a8b5190

Change-Id: Ia361f86f771a5b59ce10d4aefb6a8a53e48b4c92
 2016-10-14 00:12:58 +00:00
Garfield Tan
cc6a8b5190 DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. 
am: d91dd17f36

Change-Id: Ia7400ff8e4ecfd903a6ff7f5158786d3fd8c1bff
 2016-10-14 00:05:32 +00:00
Ben Lin
54875dd37a Removing a mimeIcon specific for album folders from MediaProvider. am: 6d33357882 
am: f3b7acecc7

Change-Id: I227fae0ffb4b97c5caec4cb60120486defdb8a81
 2016-10-14 00:01:50 +00:00
Ben Lin
f3b7acecc7 Removing a mimeIcon specific for album folders from MediaProvider. 
am: 6d33357882

Change-Id: I07ec7d315c510a5c3bb289a7fa2f6bb8100ebee8
 2016-10-13 23:51:33 +00:00
Garfield Tan
d91dd17f36 DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. 
Bug: 31945164
Bug: 30348114
Change-Id: I3ac675c83379dc269ca8e0ff1678dc3979df5252
 2016-10-12 12:31:15 -07:00
Ben Lin
6d33357882 Removing a mimeIcon specific for album folders from MediaProvider. 
Bug: 32019092
Change-Id: I3e088194023c86adbff4ada3cfd2bb2ba7ee220a
 2016-10-11 11:58:55 -07:00
Ben Lin
5e1e779098 DO NOT MERGE ANYWHERE 
Remove onBeforePop() logic so back no longer opens/closes drawer.

Bug: 30814333
Change-Id: I4f6fc2a353286f69b88e5340145f7f9b3a97e819
 2016-09-19 17:10:20 -07:00
Steve McKay
9cc31224a7 DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior. am: 3f5885918b 
am: b40d2cd0b3

Change-Id: I0e37fcfaf1868afff04413e7087df9d2e4fe2494
 2016-09-08 17:38:07 +00:00
Steve McKay
b40d2cd0b3 DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior. 
am: 3f5885918b

Change-Id: Ibe8c67367649ecc5a229b86592257b976ba2411d
 2016-09-08 17:31:12 +00:00
Steve McKay
3f5885918b DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior. 
Add write permision to VIEW intent (don't regress bahavior).
Add (already known) mimetype when creating intent.

Test: Download a CSV file to Downloads *root*.
    Install Sheets from play store.
    Navigate to Settings > Storage > Explore > (device name) > Download
    Tap CSV file.
    It should open.

NOTE: This is a (manual) cherrypick from master. Manual part necessary
as DocumentsUI has moved to a new repo in master.
a4e765f16e

Bug: 31245151
Change-Id: Ic64c655d33182e559f9645c1e173b2fe4b601d6c
 2016-09-07 20:28:51 +00:00
Steve McKay
7c3d2339ba DO NOT MERGE: Don't create DocumentInfo instances in background. am: b818058f4e 
am: 89eb830a73

Change-Id: I66d7c1fda5ddc573db4e23902110f1ad59d8cadd
 2016-08-24 20:00:50 +00:00
Steve McKay
89eb830a73 DO NOT MERGE: Don't create DocumentInfo instances in background. 
am: b818058f4e

Change-Id: Ib43fd7c9cba300821a908f7036415b8b1635bb4a
 2016-08-24 19:55:22 +00:00
TreeHugger Robot
850912db88 Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev 2016-08-24 19:49:36 +00:00
Steve McKay
b818058f4e DO NOT MERGE: Don't create DocumentInfo instances in background. 
Cursor access is not threadsafe resulting in operations on incorrect files.

Bug: 30082168
Change-Id: Ib36d5b7acdee9463b6ebd2553172e5ecb4d70857
 2016-08-24 01:34:45 +00:00
Steve McKay
50293dffb1 DO NOT MERGE: Treat unknown tooltype as touch. am: 0c28f3bda3 
am: 6c06272a12

Change-Id: Ie67b77b846c2bdc7655970c23beb725ae9adc70d
 2016-08-23 14:57:04 +00:00
Steve McKay
6c06272a12 DO NOT MERGE: Treat unknown tooltype as touch. 
am: 0c28f3bda3

Change-Id: Idbee59d7450b63735291f5218784c87f762ed19b
 2016-08-23 14:38:27 +00:00
TreeHugger Robot
8499c13740 Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev 2016-08-22 20:15:26 +00:00
TreeHugger Robot
1ae521df6a Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev 2016-08-20 03:25:36 +00:00
Shunta Sato
0e4cb1740f DO NOT MERGE: Don't delete source file when a move opration is canceled am: 682d370390 
am: 4024460305

Change-Id: I27da880eee00de2b9ac7ce0f7f812067beaccb45
 2016-08-20 00:29:41 +00:00
Shunta Sato
4024460305 DO NOT MERGE: Don't delete source file when a move opration is canceled 
am: 682d370390

Change-Id: I22b980489abe69675fe05d166576dfdbd1bd5c64
 2016-08-20 00:25:03 +00:00
TreeHugger Robot
d4f39096dd Merge "DO NOT MERGE: Don't delete source file when a move opration is canceled" into nyc-mr1-dev 2016-08-20 00:19:47 +00:00
TreeHugger Robot
8c0b46c420 Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr1-dev 2016-08-19 22:41:11 +00:00
Ben Lin
1870a159e5 DO NOT MERGE: Enable switch access api to activate/open files in DocsUI. am: d06893eb10 
am: eedf334f75

Change-Id: I37e30c83fe0f08d3b03a0015c8393f4e1fd331c3
 2016-08-19 20:38:21 +00:00
Ben Lin
eedf334f75 DO NOT MERGE: Enable switch access api to activate/open files in DocsUI. 
am: d06893eb10

Change-Id: Ib4abf6d8222af7ade0a9804de10f3152b2b451a6
 2016-08-19 20:30:13 +00:00
Ben Lin
f4c5b344ae Merge "DO NOT MERGE: Enable switch access api to activate/open files in DocsUI." into nyc-mr1-dev 2016-08-19 20:19:40 +00:00
Felipe Leme
a11d02477e DO NOT MERGE ANYWHERE 
(cherrpy pick of commit cc8fcf2efd66afdaa900b4d27e1eb784e8d40752).

Don't open drawer when back is pressed after being launched externally.

Change-Id: I3e8afd68c33b519dd5d6b27e3fa94653c2537612
Fixes: 30743235
 2016-08-17 13:54:02 -07:00
Felipe Leme
20488d97cd DO NOT MERGE ANYWHERE - Clear preferences when package is removed. 
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).

Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Fixes: 30900628
Fixes: 28722556
 2016-08-17 13:51:01 -07:00
Shunta Sato
682d370390 DO NOT MERGE: Don't delete source file when a move opration is canceled 
DNM becuase Code has moved in master.

Symptom:
A source file is deleted even if a move operation is cancled

Root cause:
MoveJob doesn't check whether a move operation is canceled or not
after copying file

Solution:
Add cancel condition check before deleting a source file

Bug: 30240042
Author: Shiotani Kouji <kouji.x.shiotani@sonymobile.com>
Change-Id: Ie68e5d96304a125c07d46a2fd5e4c9d84903d1e7
 2016-08-04 14:43:34 -07:00
Steve McKay
0c28f3bda3 DO NOT MERGE: Treat unknown tooltype as touch. 
DNM because code has changed in master.

Bug: 30182625
Change-Id: I0f226abd9eb6899d8a3ecd1c24bb1b261b3d3677
 2016-08-03 17:34:46 +00:00