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

18951 Commits

Author SHA1 Message Date
Geoff Mendal
f9f462d7ef Import translations. DO NOT MERGE 
Change-Id: I5cc8d39d08cbd52c199ffc904348a60d346e6fb7
Auto-generated-cl: translation import
 2015-08-17 05:37:50 -07:00
Daichi Hirono
b1870e922e Handle null value returned by MtpDevice#getRoots. 
BUG=23169303

Change-Id: I9602dda01f3b8919a471c1f4c88acdd19f391684
 2015-08-17 18:17:33 +09:00
Daichi Hirono
5e491c91e8 Merge "Add RootScanner to MtpDocumentsProvider to handle new/removed MTP storages." 2015-08-17 04:39:27 +00:00
Daniel Sandler
26df5a6263 am cf59d059: am 98e684e7: am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit 'cf59d059a51f33cd28b05f4c248c164bd22f95f4':
  Introducing M Land.
 2015-08-16 03:02:26 +00:00
Daniel Sandler
cf59d059a5 am 98e684e7: am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '98e684e7f464009192529f6a8f695979a4664e0f':
  Introducing M Land.
 2015-08-16 02:54:42 +00:00
Daniel Sandler
98e684e7f4 am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
  Introducing M Land.
 2015-08-16 02:48:26 +00:00
Daniel Sandler
b66e755bdb am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '64b05c0fd413d481cea19e9590732e8219a60912':
  Introducing M Land.
 2015-08-16 02:36:39 +00:00
Daniel Sandler
64b05c0fd4 am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
  Introducing M Land.
 2015-08-16 01:33:37 +00:00
Vadim Tryshev
eeea0d92a6 Merge "Eliminating “-1” user serial numbers." 2015-08-14 22:18:45 +00:00
Steve McKay
5c5c96725a Merge "Add support for single-select mode." 2015-08-14 21:37:58 +00:00
Steve McKay
dbec47a494 Add support for single-select mode. 
This is required for some of the intent invoked modes when the
"ALLOW_MULTI_SELECT" extra is not present.

Bug: 23155138
Change-Id: Ib92512c7f1c8e906ecca98d69ff727fc865fd53e
 2015-08-14 14:32:49 -07:00
Vadim Tryshev
aa5ffe4c49 Merge "Not showing excluded tasks in Recents." 2015-08-14 20:33:57 +00:00
Jorim Jaggi
23999bffaf am 05b9dc9f: am c74a43bb: am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit '05b9dc9fb5ed4b41a5eb44335dd8307171e771ba':
  Start pulse fading exactly when screen is turned on
 2015-08-14 20:14:47 +00:00
Jean-Michel Trivi
478fbd45ec am c0708cd0: am c81daf7f: am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit 'c0708cd01a23cd96d65e63d673de817e6db3912d':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 20:14:38 +00:00
Daniel Sandler
9f238a9455 Merge "Introducing M Land." into mnc-dev 2015-08-14 19:59:48 +00:00
Dan Sandler
8df3cfe6b8 Introducing M Land. 
The "M" is for Multiplayer.

Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
 2015-08-14 15:51:13 -04:00
Jorim Jaggi
05b9dc9fb5 am c74a43bb: am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit 'c74a43bba77b4a446b1c5979576619e896769b17':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:18:56 +00:00
Jorim Jaggi
c74a43bba7 am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit '4fb3e9b3af6c44b3b4bc7eee0cb917520aa7474d':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:10:43 +00:00
Jorim Jaggi
4fb3e9b3af am 50ff3afb: Start pulse fading exactly when screen is turned on 
* commit '50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
  Start pulse fading exactly when screen is turned on
 2015-08-14 19:01:55 +00:00
Jean-Michel Trivi
c0708cd01a am c81daf7f: am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit 'c81daf7ff1c2905aaea5c65c6e73a6db06ee5be8':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:55:23 +00:00
Jorim Jaggi
50ff3afb01 Start pulse fading exactly when screen is turned on 
Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
 2015-08-14 18:47:59 +00:00
Jean-Michel Trivi
c81daf7ff1 am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit 'db56efe685d249e1e0e415b3e5b2086b5c2c205c':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:47:04 +00:00
Jean-Michel Trivi
db56efe685 am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit '2152edeb3058ab9072b843bb32fbbadcc3957460':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:38:51 +00:00
Jean-Michel Trivi
2152edeb30 am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 
* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
  Fix to check the incoming userid argument for RingtonePlayer
 2015-08-14 18:33:08 +00:00
Jean-Michel Trivi
16fa58cb13 Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 2015-08-14 18:19:17 +00:00
Vadim Tryshev
cfdc2f57f2 Not showing excluded tasks in Recents. 
Now not showing strange tasks, such as crash popups, in Shelf Recents.

Bug: 20024603
Change-Id: Iccd230fa78baf447db3d93bf408c39a7d811661b
 2015-08-14 15:16:30 +00:00
Daichi Hirono
8b9024f0c2 Add RootScanner to MtpDocumentsProvider to handle new/removed MTP storages. 
BUG=23169303
Change-Id: I5a73da7f869fed2fcf69e6ab7b039d1a60b883e2
 2015-08-14 17:14:52 +09:00
Jorim Jaggi
a393249c3d am a5d38f87: am bafc9eeb: am 7453a0aa: am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit 'a5d38f8782a4fdfeed3c762d775ab470639c056e':
  Update time when turning on screen, in addition to waking up
 2015-08-14 03:28:52 +00:00
Jorim Jaggi
a5d38f8782 am bafc9eeb: am 7453a0aa: am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit 'bafc9eeb816ad94482485f6c122d9e3de97620f8':
  Update time when turning on screen, in addition to waking up
 2015-08-14 03:18:39 +00:00
Jorim Jaggi
bafc9eeb81 am 7453a0aa: am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit '7453a0aa2cf3dabb7390dec56dd4523053f20330':
  Update time when turning on screen, in addition to waking up
 2015-08-14 00:16:00 +00:00
Jorim Jaggi
7453a0aa2c am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit '587488e027c41394dc6a1f2248c4dbe8d3530b69':
  Update time when turning on screen, in addition to waking up
 2015-08-14 00:09:01 +00:00
Sungmin Choi
4a05bbcd38 Fix to check the incoming userid argument for RingtonePlayer 
In PowerNotificationWarnings, where it dispatches notifications
with UserHandle.ALL:
    mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
The fix is to have RingtonePlayer check the incoming userId argument to playAsync(),
and change USER_ALL to USER_OWNER.

BUG=22516181
BUG=22992637
Change-Id: Ia3f8aaa2bee7fb15c24542e2331b2bc5a877e715
 2015-08-13 17:07:11 -07:00
Jorim Jaggi
587488e027 am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 
* commit '81eeef589386483722c21572d9ab6d3f95dd26be':
  Update time when turning on screen, in addition to waking up
 2015-08-13 23:58:29 +00:00
Jorim Jaggi
81eeef5893 Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 2015-08-13 23:51:11 +00:00
Jorim Jaggi
9373911d41 Update time when turning on screen, in addition to waking up 
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.

Bug: 23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
 2015-08-13 15:56:41 -07:00
Jason Monk
48d520920b am 3e46cc6e: am a7e07fde: am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '3e46cc6ed7c19a85059157a36c2a7fa4991eec1e':
  Add more intelligence to bluetooth connection state
 2015-08-13 15:14:14 +00:00
Jason Monk
3e46cc6ed7 am a7e07fde: am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit 'a7e07fded12f7bd4198fd80f6e22ea1deabda43c':
  Add more intelligence to bluetooth connection state
 2015-08-13 15:07:36 +00:00
Jason Monk
a7e07fded1 am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '1f567039e042314d378b4fb50279e81d773e8733':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:59:15 +00:00
Jason Monk
1f567039e0 am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '60823dc1f90198ab2ec0e8b62cb03900251fcf77':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:52:30 +00:00
Jason Monk
60823dc1f9 am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev 
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
  Add more intelligence to bluetooth connection state
 2015-08-13 14:44:55 +00:00
Jason Monk
90460c79d1 Merge "Add more intelligence to bluetooth connection state" into mnc-dev 2015-08-13 14:38:46 +00:00
Daichi Hirono
630be43c1c Merge "Let MTPDocumentsProvider load documents in background thread." 2015-08-13 06:50:12 +00:00
Daichi Hirono
6baa16e910 Let MTPDocumentsProvider load documents in background thread. 
The CL introduce DocumentLoader class that has a responsibility for loading
documents on background thread. When the provider is requested documents and the
result is not cached, it returns the cursor containing the first 10 items with
extra loading flag. Then it loads the rest of documents into cache on background
thread and notifies update regularly.

BUG=23067619

Change-Id: I7ac9d919bc3ffee1960ae3e8e7272a792a982ea8
 2015-08-13 15:47:19 +09:00
Jorim Jaggi
61a5abcf96 am d5b3a35c: am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd5b3a35c14130deba54d9e72a10cce16adf7b99b':
  Fix touch-to-wake while dozing
 2015-08-13 03:18:25 +00:00
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master 
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
 2015-08-12 20:09:52 -07:00
Jorim Jaggi
d5b3a35c14 am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
  Fix touch-to-wake while dozing
 2015-08-13 01:18:24 +00:00
Jorim Jaggi
80581f7a65 am deb6a3ac: am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit 'deb6a3acbdbf81a995cc3c1eb2475b041564d44d':
  Require strong authentication after a timeout
 2015-08-13 01:18:18 +00:00
Jorim Jaggi
5f3af1449a am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd59f5c02810095bba4bc7a47f9169655d4be7521':
  Fix touch-to-wake while dozing
 2015-08-13 01:09:26 +00:00
Jorim Jaggi
deb6a3acbd am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '73d9e1ce0bc8e4478b165fd5f550c99830fbcb57':
  Require strong authentication after a timeout
 2015-08-13 01:09:21 +00:00
Jorim Jaggi
d59f5c0281 am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54':
  Fix touch-to-wake while dozing
 2015-08-13 01:02:35 +00:00