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

110779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Roman Nurik
c11cb1497d am 30e9065c: am 8ab80f1a: am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '30e9065c2530d9db5e63807649f1054b4ee33033':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:32:13 -07:00
Roman Nurik
30e9065c25 am 8ab80f1a: am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '8ab80f1a02874a3bc4d9ec1272536e17a888bf3c':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:24:11 -07:00
Roman Nurik
8ab80f1a02 am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:21:45 -07:00
Alan Viverette
95a4609b90 Throw exception in FragmentManager when queuing to a destroyed activity 
Change-Id: I0522cf27fd423070f7578c1c43c1f05a335810bf
 2013-08-14 11:17:25 -07:00
Roman Nurik
1a5bb9d5cf Update Typography design guide 
Bug: 6947941

Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
 2013-08-14 10:48:26 -07:00
Mike Klein
bc37c29917 am be925721: Remove comment that\'s only relevant for the underlying SkMatrix. Matrix has constructors. 
* commit 'be925721a5eef487a70baa8b0905e423c639e176':
  Remove comment that's only relevant for the underlying SkMatrix.  Matrix has constructors.
 2013-08-14 10:39:16 -07:00
Mike Klein
be925721a5 Remove comment that's only relevant for the underlying SkMatrix. Matrix has constructors. 
bug: 8470620

Change-Id: I00063dc03f752955c27c73e9c59b0496a1795924
 2013-08-14 13:13:51 -04:00
Andreas Huber
4cf755c712 am ca2fb915: Merge "Expose MediaCodec.setParameters API to" into klp-dev 
* commit 'ca2fb9158e104ac88c8014e1273fd4554e1acd23':
  Expose MediaCodec.setParameters API to
 2013-08-14 08:48:06 -07:00
Andreas Huber
ca2fb9158e Merge "Expose MediaCodec.setParameters API to" into klp-dev 2013-08-14 15:39:17 +00:00
John Spurlock
eb3f2a420f am da5b6f2d: Normalize dream service dump check with other services. 
* commit 'da5b6f2dc4ba23b6b70209f9b34fb39c93a51fc4':
  Normalize dream service dump check with other services.
 2013-08-14 07:59:18 -07:00
Matthew Xie
a52918165c am a5c81e86: Merge "LE: Add peripheral role support (1/4)" into klp-dev 
* commit 'a5c81e8636c4b7bc68713f1b2988026b275ae329':
  LE: Add peripheral role support (1/4)
 2013-08-14 07:59:08 -07:00
Matthew Xie
9208cbd342 am 08c34c32: Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev 
* commit '08c34c326fb0344221463e88c73f8db1e58ac026':
  LE: Add instance ID to descriptors (1/4)
 2013-08-14 07:58:43 -07:00
Svetoslav
111566255b am 59703c71: Merge "Partial implementation for the favorite and available printer tracking." into klp-dev 
* commit '59703c7186ea49669e7dd326a1e2e704385cbaff':
  Partial implementation for the favorite and available printer tracking.
 2013-08-14 07:58:43 -07:00
John Spurlock
da5b6f2dc4 Normalize dream service dump check with other services. 
Bug:10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2
 2013-08-14 09:49:02 -04:00
The Android Automerger
0734937c81 merge in klp-release history after reset to klp-dev 2013-08-14 06:06:12 -07:00
Matthew Xie
a5c81e8636 Merge "LE: Add peripheral role support (1/4)" into klp-dev 2013-08-14 08:14:09 +00:00
Andre Eisenbach
f46b21aa99 LE: Add peripheral role support (1/4) 
Initial stack support for the LE peripheral role.

Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
 2013-08-14 00:48:24 -07:00
Matthew Xie
08c34c326f Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev 2013-08-14 07:27:49 +00:00
Svetoslav
59703c7186 Merge "Partial implementation for the favorite and available printer tracking." into klp-dev 2013-08-14 07:09:25 +00:00
Svetoslav
66160bb881 Partial implementation for the favorite and available printer tracking. 
1. Added a dedicated class that keeps track of the user's favorite printers
   based on past usage. We keep the last 50 uses and assign a decreasing weight
   to older historical use records. The printer whose records' sum is the
   largest is considered the favorite for the user and so on.

2. Factored out the printer discovery logic from the print job config activity
   into a separate available printers provider class. It encapsulates all the
   logic to communicated with the remote print services to discover printers,
   keep track of added, updated, and removed printers.

3. Preliminary scetch of the printer chooser acitivty that will show all the
   printers.

Change-Id: I5524665f2a9a565f186db85214d5e41a44f4812e
 2013-08-14 00:06:53 -07:00
Daniel Sandler
7a4c1afb7a am 3dfa5eb9: Merge "Toward regularizing color & level across battery indicators." into klp-dev 
* commit '3dfa5eb9d9eeb12d761194cb06dc1ba63ed61e95':
  Toward regularizing color & level across battery indicators.
 2013-08-13 23:33:11 -07:00
Daniel Sandler
3dfa5eb9d9 Merge "Toward regularizing color & level across battery indicators." into klp-dev 2013-08-14 06:29:05 +00:00
Daniel Sandler
dfaf3bdeeb Toward regularizing color & level across battery indicators. 
Each of our existing assets is slightly incorrect in some
way: inconsistent pixel jumps from one percent to the next,
inconsistent color change, etc. The only way to get it
perfectly right is to draw it programmatically.

Bug: 8504254 // inconsistent color change threshold
-- previously --
Bug: 3136046 // in Gingerbread
Bug: 3387973 // Honeycomb
Bug: 5070948 // ICS
Change-Id: I6a3e7409ecec55e10328541ecb1e9d54aebdbe96
 2013-08-13 23:21:08 -07:00
Daniel Sandler
0a565f3dcf am 0155a90e: Merge "How did that get there?" into klp-dev 
* commit '0155a90eb4197a9aa1f8d53c90b02e5b53167183':
  How did that get there?
 2013-08-13 22:30:10 -07:00
Daniel Sandler
0155a90eb4 Merge "How did that get there?" into klp-dev 2013-08-14 05:24:34 +00:00
Daniel Sandler
8800e46d84 How did that get there? 
Whoever checked this in: Turn in your badge and your gun.

Change-Id: I635dbc3bae6a58bf425241fb4105e26cc03a9869
 2013-08-13 22:19:50 -07:00
Daniel Sandler
7b9173b6f0 am a53d38bc: Merge "Drop simultaneous pointer events when tracking velocity." into klp-dev 
* commit 'a53d38bc286ee35ab77843ad5b4c6b2fb9e81ac5':
  Drop simultaneous pointer events when tracking velocity.
 2013-08-13 19:41:59 -07:00
Daniel Sandler
a53d38bc28 Merge "Drop simultaneous pointer events when tracking velocity." into klp-dev 2013-08-14 02:35:33 +00:00
Andre Eisenbach
25b9cf953b LE: Add instance ID to descriptors (1/4) 
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.

Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
 2013-08-13 19:25:05 -07:00
Daniel Sandler
69f756fe9b Drop simultaneous pointer events when tracking velocity. 
They're not really simultaneous, but within 1ms of one
another, which is too close for getEventTime() to
distinguish; these events were causing the velocity
computation to become (understandably) confused and
resulting in failed panel flings.

Bug: 10246454
Change-Id: I3829192cdf9ad2a222ec8deca031d772d58de0da
 2013-08-13 19:24:19 -07:00
Lajos Molnar
217f37cecc am 1bab5064: Merge "MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities" into klp-dev 
* commit '1bab5064eb907e369a14903a3888847f1dae63a0':
  MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities
 2013-08-13 18:34:46 -07:00
Kenny Root
0f25e6da59 am 3fbaf5a6: am 5ad480c8: am 965eb258: am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '3fbaf5a6df1ebc413ee6e8160be9706858dad516':
  Use hostname verifier directly instead of instance
 2013-08-13 18:30:44 -07:00