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

32451 Commits

Author SHA1 Message Date
Kenny Root
450f21a97d am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit 'd26f7139a7ff42ca1be470657515767f7509955b':
  Add JNI bindings for some of the libselinux interfaces.
 2012-06-08 14:08:28 -07:00
Daniel Sandler
97f2d6acd6 am 4dc0cf7b: am 6cf0c336: Merge "Various notification template cleanups." into jb-dev 
* commit '4dc0cf7bf376aa78d7fbccc8481673d98dae7c08':
  Various notification template cleanups.
 2012-06-08 14:08:16 -07:00
Kenny Root
d26f7139a7 Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-06-08 13:59:21 -07:00
Jonathan Dixon
65ae8d8705 Merge "Extract WebView Classic details from API classes." 2012-06-08 13:53:05 -07:00
Jonathan Dixon
57217f238e Merge "Separate interface and implementation of 2 more WebView classes" 2012-06-08 13:52:33 -07:00
Kenny Root
e38b1c4d15 resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp 
Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
 2012-06-08 13:47:46 -07:00
Daniel Sandler
4dc0cf7bf3 am 6cf0c336: Merge "Various notification template cleanups." into jb-dev 
* commit '6cf0c3365a40854f63f0abff2fa67d24432d0218':
  Various notification template cleanups.
 2012-06-08 13:40:05 -07:00
Daniel Sandler
6cf0c3365a Merge "Various notification template cleanups." into jb-dev 2012-06-08 13:38:02 -07:00
Kenny Root
9855f6e210 am 7b2d0563: Merge "Add JNI bindings for some of the libselinux interfaces." 
* commit '7b2d056342176b5e7ff19842fc9202f2f8d36b76':
  Add JNI bindings for some of the libselinux interfaces.
 2012-06-08 13:09:12 -07:00
Kenny Root
7b2d056342 Merge "Add JNI bindings for some of the libselinux interfaces." 2012-06-08 12:25:07 -07:00
Jonathan Dixon
73eeb7b5ed Extract WebView Classic details from API classes. 
Last remaining bits:
- push JNUUtil.setContext call down into WebViewDatabaseClassic
- remove references to hidden ClientCertRequestHandler from the public API classes.

Change-Id: I9605dc2493b73fe8f22c7bb38c73d36632e0c7fa
 2012-06-08 11:33:39 -07:00
Fabrice Di Meglio
072b962afb Merge "Make Toast widget aware of layout direction" 2012-06-08 11:31:21 -07:00
Dianne Hackborn
c7e2d4a57b am 33e39aef: am 0876ab0a: Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev 
* commit '33e39aefdf9266dc4858f7a6171f46f43ffa3ec3':
  Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
 2012-06-08 11:12:27 -07:00
rich cannings
3191329819 Merge "Add Intent extras to pass to package verifiers" 2012-06-08 11:08:50 -07:00
Dianne Hackborn
33e39aefdf am 0876ab0a: Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev 
* commit '0876ab0ac17518c479e9dffe025884870a586d9c':
  Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
 2012-06-08 11:04:13 -07:00
Dianne Hackborn
0876ab0ac1 Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev 2012-06-08 11:01:42 -07:00
Adam Powell
2828b8affd am bd0edb47: am f2427580: Merge "Progress bar assets - once more, with feeling!" into jb-dev 
* commit 'bd0edb479f212746ea1265c7bf57d1382d337fad':
  Progress bar assets - once more, with feeling!
 2012-06-08 10:17:57 -07:00
Adam Powell
bd0edb479f am f2427580: Merge "Progress bar assets - once more, with feeling!" into jb-dev 
* commit 'f2427580732b3651fb97ac4859334718d2260d15':
  Progress bar assets - once more, with feeling!
 2012-06-08 10:14:12 -07:00
Adam Powell
f242758073 Merge "Progress bar assets - once more, with feeling!" into jb-dev 2012-06-08 10:11:40 -07:00
Kenny Root
b313a9990f am f5490997: am af95137a: Merge "Whoops, this version number wasn\'t updated when JB was introduced!" into jb-dev 
* commit 'f549099705d0e55410072db89926f1cb95a3e7b5':
  Whoops, this version number wasn't updated when JB was introduced!
 2012-06-08 09:58:18 -07:00
Kenny Root
f549099705 am af95137a: Merge "Whoops, this version number wasn\'t updated when JB was introduced!" into jb-dev 
* commit 'af95137a9f48710d8356c5f33334b9ce60f2fb68':
  Whoops, this version number wasn't updated when JB was introduced!
 2012-06-08 09:53:49 -07:00
Kenny Root
af95137a9f Merge "Whoops, this version number wasn't updated when JB was introduced!" into jb-dev 2012-06-08 09:51:04 -07:00
Daniel Sandler
619738c9e7 Various notification template cleanups. 
Bug: 6597693 // hide line3 in InboxStyle
Bug: 6593691 // vertical centering inconsistencies
Bug: 6592116 // no left action gutter in BigPicture
Bug: 6622757 // missing subtext in BigText expanded
Change-Id: I941af99d0a905b6e0aa6fb74ad4eff29c17d9fc2
 2012-06-08 11:41:37 -04:00
Adam Powell
39987ceb72 Progress bar assets - once more, with feeling! 
Bug 6628236

Change-Id: I06369f37caf3db8b00047822f5fda44ce380e01b
 2012-06-07 19:23:36 -07:00
Dianne Hackborn
1db36528b1 Whoops, this version number wasn't updated when JB was introduced! 
Change-Id: I9c9cd658cc1cba99b84059c8873c22b21b9f3c19
 2012-06-07 18:20:55 -07:00
John Reck
8d79d27275 am b4760127: am 839fd414: Merge "Eliminate gap between finalize() and destroy()" into jb-dev 
* commit 'b47601279f8d5170d2beaaf7c1e8c9a713a972da':
  Eliminate gap between finalize() and destroy()
 2012-06-07 17:21:42 -07:00
John Reck
5c25762bcf am 13b9d282: am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev 
* commit '13b9d28268d76b886be0a8cbd15a1d059c276d6b':
  Stay in layer scroll if nothing to scroll
 2012-06-07 17:21:35 -07:00
Jean-Michel Trivi
bc35b34a7c am dbb9e386: am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" into jb-dev 
* commit 'dbb9e38673bd133fa61a10d874ca325d23f3b5e3':
  Configuration for lock and UI sound levels
 2012-06-07 17:21:27 -07:00
Dianne Hackborn
d0c5f515c0 Fix issue #6295373: "Package com.google.android.apps.authenticator2 has... 
...mismatched uid: X on disk, Y in settings" errors on Froyo and Gingerbread

Deal more gracefully with the uid changing in three ways:

1. If the uid on disk has become root, then have installd change it to
   the application's uid.  This is to correct a potential case where
   installd was interrupted while linking or unlinking the libs dir,
   during which it temporarily changes the owner of the dir to root
   so that a malicious app can not get in its way.  So if the uid on
   disk has become root, we assume we can safely just change it back
   to the correct uid.

2. When scaning packages at boot, use the same "delete and rebuild data
   directory" code for third party applications as we have for system
   applications.  This allows us to at least end up in a state where the
   app will run, even if its data is lost.

3. But we really don't want to get in to case 2, so if an application
   update is being installed and we find that the uid we now have for
   the app is different than the one on disk, fail the update.  This will
   protect against for example a developer changing the sharedUserId of
   their app and getting into this bad state.

Bug: 6295373
Change-Id: Ic802fdd818ac62449ff3c61d1fff1aa4d4942f39
 2012-06-07 16:57:57 -07:00
John Reck
b47601279f am 839fd414: Merge "Eliminate gap between finalize() and destroy()" into jb-dev 
* commit '839fd4144e369a9bde4fff4a5a2b6cc9e078cef8':
  Eliminate gap between finalize() and destroy()
 2012-06-07 16:34:34 -07:00
John Reck
13b9d28268 am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev 
* commit '0e0ce11e57a9506ad4429269732f3b7144875a84':
  Stay in layer scroll if nothing to scroll
 2012-06-07 16:34:30 -07:00
Jean-Michel Trivi
dbb9e38673 am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" into jb-dev 
* commit '6a5f9f6ddbfcb97a25436ad34be39fc7b3b45168':
  Configuration for lock and UI sound levels
 2012-06-07 16:34:27 -07:00
Fabrice Di Meglio
b4946343e8 Make Toast widget aware of layout direction 
- Toast will resolve its gravity (when START / END) from the System locale
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I3fe810b87d708f2ee80ca6258ad25ab32ae85d82
 2012-06-07 16:29:18 -07:00
rich cannings
368ed010ee Add Intent extras to pass to package verifiers 
Adding extras to identify the:

 - URL from which the APK originated

 - the HTTP referrer associate with the URL

Bug: 6544677
Change-Id: Ie3d2244d9befa7161eeceb458573d6b0f8206cc7
 2012-06-07 16:11:25 -07:00
John Reck
839fd4144e Merge "Eliminate gap between finalize() and destroy()" into jb-dev 2012-06-07 15:57:56 -07:00
John Reck
0e0ce11e57 Merge "Stay in layer scroll if nothing to scroll" into jb-dev 2012-06-07 15:29:46 -07:00
Jean-Michel Trivi
6a5f9f6ddb Merge "Configuration for lock and UI sound levels" into jb-dev 2012-06-07 15:28:51 -07:00
John Reck
919c89e204 Stay in layer scroll if nothing to scroll 
Bug: 6628376
 The issue here is that contentX & contentY can both be 0 if we are scrolling
 slowly enough as they are adjusted by the page's scale and can thus round down.
 However, this would result in us falling out of layer drag mode even though
 we haven't tried to scroll past the edge of the layer. Detect this case, and
 stay in layer scroll mode.

Change-Id: I3c655d0d03e8f89887abbe718bd24699c133ee1a
 2012-06-07 14:45:34 -07:00
Gilles Debunne
3eaf181f96 am 11c15cfb: am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev 
* commit '11c15cfb4e48c53bcaf648c82de12707d6e479ba':
  Fixed cast exception with selectable text.
 2012-06-07 14:22:39 -07:00
Eric Fischer
7ddb44b193 Merge "Import translations. DO NOT MERGE" 2012-06-07 14:19:35 -07:00
Gilles Debunne
11c15cfb4e am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev 
* commit '78c6aeeffac7b665a0e1d822e88c92ef2b5ef353':
  Fixed cast exception with selectable text.
 2012-06-07 14:18:44 -07:00
Gilles Debunne
78c6aeeffa Merge "Fixed cast exception with selectable text." into jb-dev 2012-06-07 14:15:40 -07:00
Eric Fischer
61168975d0 am 0646411c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '0646411cbd91039e843c0f3067ea0a379176978a':
  Import translations. DO NOT MERGE
 2012-06-07 14:00:58 -07:00
Svetoslav Ganov
4210a6f08b am 8114f439: am ddbcce81: Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev 
* commit '8114f439fe8b409a00ac704b37128922690e2186':
  Cannot interact with dialogs when IME is up and on not touch explored popups.
 2012-06-07 14:00:29 -07:00
Eric Fischer
3791b1064c Import translations. DO NOT MERGE 
Change-Id: Ic63325396d895ea95a0a638e09f5f127f4821f19
 2012-06-07 13:59:50 -07:00
Eric Fischer
0646411cbd Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-07 13:56:09 -07:00
Svetoslav Ganov
8114f439fe am ddbcce81: Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev 
* commit 'ddbcce81acaa744d35c727d9a530b04255fab5af':
  Cannot interact with dialogs when IME is up and on not touch explored popups.
 2012-06-07 13:53:39 -07:00
Eric Fischer
bd646b8e1c Import translations. DO NOT MERGE 
Change-Id: Ic209397930750934fe3ab136ab3a4586257c1ed3
 2012-06-07 13:52:56 -07:00
Svetoslav Ganov
ddbcce81ac Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev 2012-06-07 13:50:58 -07:00
John Reck
d5e2937933 Eliminate gap between finalize() and destroy() 
Bug: 6569073
 Only nativeDestroy and nativeStopGL need to be called on the UI thread,
 so split up destroyImpl into 3 functions, and only have the native
 destroy be pushed to the UI thread if necessary. Also make the work that
 is delayed be static without references to the finalizing WebView to allow
 it to be fully deleted immediately after finalization.

Change-Id: I4e424051e69df0bc409af95ca3f3d2b9e58a6b75
 2012-06-07 13:14:57 -07:00