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

110813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
99df31a254 am 1d5ac159: Merge "Maintain TRANSIENT_*_BAR flags until transient bars hidden." into klp-dev 
* commit '1d5ac159745234d54fd6aa63fa43c85741bcaf6d':
  Maintain TRANSIENT_*_BAR flags until transient bars hidden.
 2013-08-15 15:18:07 -07:00
John Spurlock
1d5ac15974 Merge "Maintain TRANSIENT_*_BAR flags until transient bars hidden." into klp-dev 2013-08-15 22:13:14 +00:00
Jeff Sharkey
24ccfaf324 am 09400249: Merge "DocumentsUI handles GET_CONTENT; hinting, errors." into klp-dev 
* commit '0940024980a9e7a96ab28612c2331d31741f0199':
  DocumentsUI handles GET_CONTENT; hinting, errors.
 2013-08-15 15:02:11 -07:00
Jeff Sharkey
0940024980 Merge "DocumentsUI handles GET_CONTENT; hinting, errors." into klp-dev 2013-08-15 21:53:54 +00:00
Romain Guy
2a9195d53d am 3ed72781: Convert 4444 bitmaps to 8888 Bug #10206452 
* commit '3ed72781a0b155a88e52c8d295f50daab8cfb9ae':
  Convert 4444 bitmaps to 8888 Bug #10206452
 2013-08-15 14:42:49 -07:00
John Spurlock
27735a4ba5 Maintain TRANSIENT_*_BAR flags until transient bars hidden. 
Also factor common bar-management code into a separate helper
class called BarController instead of continuing to pollute
PhoneWindowManager with duplicate logic.

Bug:10345412
Change-Id: I880900e61daa6c2c53b169e4885e68ebc62ecb6c
 2013-08-15 17:16:28 -04:00
Jeff Sharkey
54ca29a5b9 DocumentsUI handles GET_CONTENT; hinting, errors. 
Document browser now takes over all GET_CONTENT requests that request
openable Uris. It shows both storage backends and includes other apps
that respond to GET_CONTENT. Only grants transient read permissions.

Better guarding against throwing storage backends. Send sort order
and local-only hinting to backends.

Require that OPEN/CREATE_DOC users include openable category.

Bug: 10330112, 10329976, 10340741, 10331689, 10329971
Change-Id: Ieb8768a6d71201816046f4a4c48832061a313c28
 2013-08-15 14:14:48 -07:00
Romain Guy
3ed72781a0 Convert 4444 bitmaps to 8888 
Bug #10206452

Change-Id: I928c9189b0d80741490b01a739959d8c2d5312a7
(cherry picked from commit a2cdb59b186d0ee51f110c1a7d358911573d48bf)
 2013-08-15 19:56:05 +00:00
Dmitry Shmidt
db7f9f3842 am 0d8afa2e: Merge "wifi: Send event without prefix to p2p0" into klp-dev 
* commit '0d8afa2ea314c142320bf921f81540a37561f6eb':
  wifi: Send event without prefix to p2p0
 2013-08-15 12:36:43 -07:00
Dmitry Shmidt
0d8afa2ea3 Merge "wifi: Send event without prefix to p2p0" into klp-dev 2013-08-15 19:32:33 +00:00
Michael Wright
f4e2e651b3 am cf770f41: Merge "Bound touch and tool axes lengths below at 0" into klp-dev 
* commit 'cf770f41ad9fdeadb5d5000071a6f7ee8818f212':
  Bound touch and tool axes lengths below at 0
 2013-08-15 12:31:11 -07:00
Jeff Sharkey
40faf8dc65 am e0475c82: Gracefully handle missing directories. 
* commit 'e0475c828773aae42bf6bf54422df996d6b0fcef':
  Gracefully handle missing directories.
 2013-08-15 12:27:38 -07:00
Michael Wright
cf770f41ad Merge "Bound touch and tool axes lengths below at 0" into klp-dev 2013-08-15 19:26:43 +00:00
Jeff Sharkey
e0475c8287 Gracefully handle missing directories. 
Bug: 10295932
Change-Id: I9d18682d0ba57bf7f77d043ee8dab286ee80ba2a
 2013-08-15 12:04:37 -07:00
Dmitry Shmidt
bbabe14333 wifi: Send event without prefix to p2p0 
Bug: 9298955

Change-Id: I71037dd1cd60ee4efa75e1d6fab60a07bdf0626d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-08-15 11:13:03 -07:00
Jeff Sharkey
fa1225d021 am 2241d45c: Merge "Root invalidation, write and grid flags, local." into klp-dev 
* commit '2241d45c68739e5bdf187ba3325ee237ef143e21':
  Root invalidation, write and grid flags, local.
 2013-08-15 09:49:37 -07:00
Jeff Sharkey
2241d45c68 Merge "Root invalidation, write and grid flags, local." into klp-dev 2013-08-15 16:44:15 +00:00
John Spurlock
2b5d0264b2 am ac0a1ea0: Merge "Recover tracking pointer going up mid-gesture in shade." into klp-dev 
* commit 'ac0a1ea06f4a11550e3ee476bbb89ece2984e826':
  Recover tracking pointer going up mid-gesture in shade.
 2013-08-15 09:42:47 -07:00
John Spurlock
ac0a1ea06f Merge "Recover tracking pointer going up mid-gesture in shade." into klp-dev 2013-08-15 16:38:46 +00:00
Daniel Sandler
f9310baf2e am da68124d: Merge "Defend against NPE." into klp-dev 
* commit 'da68124da23acadc192ba996d0e64f6d362a9a26':
  Defend against NPE.
 2013-08-15 09:11:57 -07:00
Daniel Sandler
da68124da2 Merge "Defend against NPE." into klp-dev 2013-08-15 16:06:49 +00:00
John Spurlock
48fa91a818 Recover tracking pointer going up mid-gesture in shade. 
Keep track of the pointer id used in driving the gesture. If
it happens to go up mid-gesture (another pointer is still down),
continue the gesture with another down pointer, instead of
abruptly jumping on next ACTION_MOVE.

Bug:10246050
Change-Id: Ia6e59658635fd696974fe415f37811d27da80519
 2013-08-15 09:29:31 -04:00
Jeff Sharkey
5b83f854d9 Root invalidation, write and grid flags, local. 
Flags to indicate write support, and to indicate that a grid view is
preferred.  Method to inform system that any root caches should be
invalidated.  Methods to mark a Uri as requesting "local only" data.

Helper method for document creation.

Bug: 10330069, 10330108, 10330210, 10329976
Change-Id: I6ce6160f6ce6621e6ea05848a31bbbcb84587671
 2013-08-14 21:52:37 -07:00
Michael Wright
eeadb32488 Bound touch and tool axes lengths below at 0 
Change-Id: I75ca196312201773cfabb74ee5b28a7d80f6ba60
 2013-08-14 17:33:27 -07:00
Alan Viverette
cd63115ebc am 70e907f5: Merge "Prevent refocus after entering touch mode" into klp-dev 
* commit '70e907f51f75bf8d481e11e0d6411e2974b83b06':
  Prevent refocus after entering touch mode
 2013-08-14 17:07:35 -07:00
Alan Viverette
70e907f51f Merge "Prevent refocus after entering touch mode" into klp-dev 2013-08-15 00:01:03 +00:00
John Spurlock
6d59c85c09 am 63169fb9: Merge "Ensure LOW_PROFILE is always clear when bars are transient." into klp-dev 
* commit '63169fb9a6d1abc63dd2a62691527d4a1269e5cd':
  Ensure LOW_PROFILE is always clear when bars are transient.
 2013-08-14 16:55:28 -07:00
John Spurlock
63169fb9a6 Merge "Ensure LOW_PROFILE is always clear when bars are transient." into klp-dev 2013-08-14 23:50:39 +00:00
Alan Viverette
cc8ad26409 am 76e696f6: Merge "Add motion event forwarding hidden APIs to View" into klp-dev 
* commit '76e696f6d288babc20fcb1eb7e1d6e720e651924':
  Add motion event forwarding hidden APIs to View
 2013-08-14 16:07:14 -07:00
Alan Viverette
76e696f6d2 Merge "Add motion event forwarding hidden APIs to View" into klp-dev 2013-08-14 23:01:56 +00:00
Alan Viverette
3459bf81bc am 5482ab01: Merge "Throw exception in FragmentManager when queuing to a destroyed activity" into klp-dev 
* commit '5482ab01e37accb4f5559af80f8d5d6e92b353ff':
  Throw exception in FragmentManager when queuing to a destroyed activity
 2013-08-14 16:00:27 -07:00
Alan Viverette
5482ab01e3 Merge "Throw exception in FragmentManager when queuing to a destroyed activity" into klp-dev 2013-08-14 22:55:55 +00:00
Elliott Hughes
69ac631932 am 12285f3d: DateUtils should use the user\'s 12/24-hour preference, not the locale\'s. 
* commit '12285f3d9f756226c13ef93054b87e0d487e1409':
  DateUtils should use the user's 12/24-hour preference, not the locale's.
 2013-08-14 15:34:42 -07:00
Elliott Hughes
2fe5e27db8 am 8a196065: am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s." 
* commit '8a196065992a6b2df690467075ef644131465d76':
  DateUtils should use the user's 12/24-hour preference, not the locale's.
 2013-08-14 15:33:07 -07:00
Elliott Hughes
8a19606599 am 82461951: Merge "DateUtils should use the user\'s 12/24-hour preference, not the locale\'s." 
* commit '82461951c3bddd5e6873dbb66703b838cbb66b2c':
  DateUtils should use the user's 12/24-hour preference, not the locale's.
 2013-08-14 15:30:02 -07:00
Elliott Hughes
12285f3d9f DateUtils should use the user's 12/24-hour preference, not the locale's. 
Bug: 10312832

(cherry picked from commit f0b79aeed36f0839e4effaa36893b7ca71292563)

Change-Id: I0d78725d47009553f9003ccfba06f70f178a6ec1
 2013-08-14 15:27:17 -07:00
Elliott Hughes
82461951c3 Merge "DateUtils should use the user's 12/24-hour preference, not the locale's." 2013-08-14 22:26:13 +00:00
Elliott Hughes
f0b79aeed3 DateUtils should use the user's 12/24-hour preference, not the locale's. 
Bug: 10312832
Change-Id: If23c124cf8442988de5feccb6f2c40b808a2eb89
 2013-08-14 15:12:43 -07:00
The Android Open Source Project
825c4d9582 Reconcile with klp-release - do not merge 
Change-Id: I11d427fe49ec6cb012b0176734dc245eabd5f50b
 2013-08-14 15:10:18 -07:00
Alan Viverette
6fb3b9eb28 Add motion event forwarding hidden APIs to View 
Change-Id: Ia7ab5496f8064c96b34912b5f5e9af6fd0978b34
 2013-08-14 14:57:13 -07:00
Eino-Ville Talvala
315f769221 am 66a83ae6: Merge "Camera2: Add metadata keys and enum values" into klp-dev 
* commit '66a83ae6500d735b5abb6a97c86addcb1c958d68':
  Camera2: Add metadata keys and enum values
 2013-08-14 13:26:38 -07:00
Eino-Ville Talvala
66a83ae650 Merge "Camera2: Add metadata keys and enum values" into klp-dev 2013-08-14 20:20:43 +00:00
Jeff Sharkey
fd3e2ebb78 am 7d56ef2d: Merge "Add GIDs to packages.list, update SD card perms." into klp-dev 
* commit '7d56ef2d808289a148085b9bff1448d331f4643e':
  Add GIDs to packages.list, update SD card perms.
 2013-08-14 13:13:57 -07:00
John Spurlock
2617006950 Ensure LOW_PROFILE is always clear when bars are transient. 
Bug:10326361
Change-Id: I4d12c4973153aac72bc840840f061ec782e27a87
 2013-08-14 16:08:45 -04:00
Jeff Sharkey
7d56ef2d80 Merge "Add GIDs to packages.list, update SD card perms." into klp-dev 2013-08-14 20:08:36 +00:00
John Spurlock
3ebd1ce9a6 Normalize dream service dump check with other services. 
Bug:10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2
 2013-08-14 12:39:06 -07:00
The Android Open Source Project
27d209d253 am 80f7ec06: am 04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge 
* commit '80f7ec06d0e45a8724122d5b4451ee12e37f9aac':
  Use hostname verifier directly instead of instance DO NOT MERGE
  If in a mobile captive portal is detected enable fail fast.
  Have CaptivePortalTracker use gservices updateable provisioning urls.
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
  Check that hipri has started.
  Fix issue #10226007: Reset apps restores most of the changed settings...
  Fix issue #10226007: Reset apps restores most of the changed settings...
 2013-08-14 12:19:46 -07:00
The Android Open Source Project
80f7ec06d0 am 04b40ee3: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge 
* commit '04b40ee33e0f1649bedc9b0b9b3e277b6b37f164':
  Use hostname verifier directly instead of instance DO NOT MERGE
  If in a mobile captive portal is detected enable fail fast.
  Have CaptivePortalTracker use gservices updateable provisioning urls.
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
  Check that hipri has started.
  Fix issue #10226007: Reset apps restores most of the changed settings...
  Fix issue #10226007: Reset apps restores most of the changed settings...
 2013-08-14 12:16:21 -07:00
Roman Nurik
c916d04d74 am c11cb149: am 30e9065c: am 8ab80f1a: am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit 'c11cb1497d26daaf445ca232057027bebc44086c':
  Update Typography design guide Bug: 6947941
 2013-08-14 12:10:13 -07:00
The Android Open Source Project
04b40ee33e Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge 
Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f
 2013-08-14 12:09:27 -07:00