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

90753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
32d932c72d am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 
* commit '19348623fa006a87e668a1c69c412b0ff5da88c9':
  Updated Roboto fonts with correct T comma accent encoding
 2012-10-04 18:19:00 -07:00
Raph Levien
19348623fa Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 2012-10-04 18:15:55 -07:00
Amith Yamasani
dd185ea0df am a32c4ec5: am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit 'a32c4ec5f385256d9d31ae311f8870d5d1d8549f':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:10:27 -07:00
Adam Cohen
c5bbd1c6a5 am 451d49b3: am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '451d49b34c8399a3479ca96addcc11857b6afb3e':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:08:36 -07:00
Satoshi Kataoka
6cb4be0aa6 am 42802338: am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '4280233813c22663d3e9d100cac70eaccd0d2afc':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:08:32 -07:00
Amith Yamasani
a32c4ec5f3 am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit '21f0777c1145f931d0f11c8f235a83c4e6edc4eb':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:07:40 -07:00
Adam Powell
3c565acd99 am 7eff1d28: am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '7eff1d28e23e546d456f21755155158e74c93711':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:06:52 -07:00
Adam Cohen
451d49b34c am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit 'a39c5c369af24cc25f77b9ac97dfffae41c73eb6':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:05:48 -07:00
Satoshi Kataoka
4280233813 am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '0f300c7045f150722532fd50dd78f6fcb4c4f395':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:05:45 -07:00
Amith Yamasani
21f0777c11 am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit 'c192c649ba3b79dff70c5ccf981d631b929b5778':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:05:34 -07:00
Adam Powell
7eff1d28e2 am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '123436ebd5adc528c23e378bd552d9548a8a27ad':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:03:58 -07:00
Amith Yamasani
c192c649ba Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 2012-10-04 18:03:47 -07:00
Adam Cohen
a39c5c369a am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '327424d69b99213e872e91f05feba2d0a137d6c7':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:03:36 -07:00
Satoshi Kataoka
0f300c7045 am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:03:33 -07:00
Jeff Brown
5430835934 Ensure we send at least one wakeup/gotosleep transition. 
This fixes an issue where the device would not lock immediately
when the user quickly pressed power off / power on even if
configured to do so.  We were suppressing the screen off
and wake up broadcast in this case.

Now we make sure to always send at least one broadcast to
indicate the transition.  We still collapse back-to-back
full cycle transitions though so as not to end up enqueuing
useless broadcasts.

Bug: 7061116
Change-Id: I7211c5fd963c271c2b0aceb4d2f746063c629079
 2012-10-04 18:03:11 -07:00
Adam Powell
123436ebd5 am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '2ee1f6567d2bc25c58f212354ffd09df18fc0b25':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:01:52 -07:00
Christian Robertson
439b85ef9d Updated Roboto fonts with correct T comma accent encoding 
Updated Roboto fonts fixing issue where Tcommaaccent and Tcedilla
characters were encoded improperly (their values were switched). This
patch addresses bug 7198855 and bug 7070912. Original was mistakenly
submitted to master but should be applied to jb-mr1-dev instead.

Also, this commit reverts the addition of RobotoCondensed-Light and its
italic, for which we don't have any build file or XML metadata support.

Change-Id: If1c592474f1f7199e98bb98edf4de6466b43fa51
 2012-10-04 18:01:14 -07:00
Adam Cohen
327424d69b Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Satoshi Kataoka
284b205387 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 2012-10-04 18:00:01 -07:00
Adam Cohen
f752202bee Plumbing to allow keyguard to be shown with user switcher (issue 7175023) 
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService

Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
 2012-10-04 17:53:01 -07:00
Jeff Brown
7952056c71 am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
  Allow phone to go to sleep while in call.
 2012-10-04 17:39:07 -07:00
Jeff Brown
b1e93505ae am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
  Allow phone to go to sleep while in call.
 2012-10-04 17:37:29 -07:00
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
 2012-10-04 17:35:29 -07:00
Amith Yamasani
634cf31345 Fix serial number assignment for new user on a freshly wiped device 
Bug: 7280093

User serial number was not being bumped up from 0 on a freshly wiped device
due to the userlist not existing. This was resulting in the first 2 users
getting the same serial number, messing up C2DM message delivery. This issue
doesn't show up if you boot the device before adding a user, so it wasn't
discovered earlier.

Change-Id: I8a5d99b9ad2ccfb66a16cacac9548ba53f0be387
 2012-10-04 17:34:21 -07:00
Amith Yamasani
af0e7e878f am 9893c47d: am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '9893c47d331fd9dd92d845b6f1a3202cc4ed503b':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:34:16 -07:00
Amith Yamasani
9893c47d33 am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '344e019ace59cee49bce2e7b522ecba8e3b8f1c0':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:32:48 -07:00
Jeff Brown
17f36d154f Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 2012-10-04 17:32:46 -07:00
Amith Yamasani
344e019ace am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '82245c199b2bbd2f598ce3c863eea425b4909cac':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:30:49 -07:00
Amith Yamasani
82245c199b Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 2012-10-04 17:29:34 -07:00
Victoria Lease
e44d6855db am 768ad29b: am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit '768ad29b9dd120d30ae0b28e2ad30ba3006dea3c':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:20:18 -07:00
Victoria Lease
cef918dee0 am 9c2ce5a6: am b1cc90c5: am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit '9c2ce5a675b6453f94658776c65402ee948476da':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:18:38 -07:00
Victoria Lease
768ad29b9d am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit 'fddea6042eddf6c54d30fd313f9f317f6b33ef5e':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:17:34 -07:00
Victoria Lease
9c2ce5a675 am b1cc90c5: am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit 'b1cc90c553a7aaf029a84249bb9578c7d88fd53b':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:15:35 -07:00
Dianne Hackborn
33f9cb8cf0 Fix issue #7290206: Need API to get/look up user serial number 
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
 2012-10-04 17:15:10 -07:00
Victoria Lease
fddea6042e am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 
* commit 'dfc8e799ed7500c1a07d4ba1f72e77d3de0f803a':
  Handle other providers in isAllowedProviderSafe()
 2012-10-04 17:14:45 -07:00
Victoria Lease
b1cc90c553 am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 
* commit '2646b3a46af3a24d54acffb1f956deeb6831d3ab':
  Prevent  overflow in LocationRequest.setExpireIn()
 2012-10-04 17:12:59 -07:00
Victoria Lease
dfc8e799ed Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 2012-10-04 17:11:42 -07:00
Victoria Lease
2646b3a46a Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 2012-10-04 17:10:22 -07:00
Christopher Tate
201809eea6 am 6d5cd6cb: am f86aeb66: am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit '6d5cd6cb56c0317247ebd597b2622bfeb581bcaf':
  Make sure to check write perms after rewriting destination table
 2012-10-04 17:00:28 -07:00
Robert Greenwalt
b51dd7b3cd am ca6a2c34: am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit 'ca6a2c34538a8691d259bdc935c611bda7407532':
  Properly cancel Tether notification.
 2012-10-04 16:58:39 -07:00
Christopher Tate
6d5cd6cb56 am f86aeb66: am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit 'f86aeb66360bc825090c18851ffb8d89baa000bf':
  Make sure to check write perms after rewriting destination table
 2012-10-04 16:57:50 -07:00
Victoria Lease
cd6cee171b am 50d849ed: am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit '50d849ed8970977e2bb65fdd482f9be2a4af8491':
  multiuser support for LocationBlacklist
 2012-10-04 16:57:00 -07:00
Robert Greenwalt
ca6a2c3453 am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit '0d1bd1911e3fe470a4da5fd82ba602c6c3cc8944':
  Properly cancel Tether notification.
 2012-10-04 16:56:06 -07:00
Christopher Tate
f86aeb6636 am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 
* commit 'dd2f15a563f18c9534cfa85fe2b8bf2fe100ed83':
  Make sure to check write perms after rewriting destination table
 2012-10-04 16:55:55 -07:00
Victoria Lease
50d849ed89 am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit '9c6816981f9b4919e97dc3e5489efd7d94e9a33a':
  multiuser support for LocationBlacklist
 2012-10-04 16:54:22 -07:00
Robert Greenwalt
0d1bd1911e am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev 
* commit '7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5':
  Properly cancel Tether notification.
 2012-10-04 16:53:25 -07:00
Christopher Tate
dd2f15a563 Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 2012-10-04 16:52:46 -07:00
Victoria Lease
9c6816981f am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 
* commit 'a9afaccf303da2b57a47ad16cca559e87e649d15':
  multiuser support for LocationBlacklist
 2012-10-04 16:51:43 -07:00
Robert Greenwalt
7fd1386b8a Merge "Properly cancel Tether notification." into jb-mr1-dev 2012-10-04 16:50:40 -07:00