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

36552 Commits

Author SHA1 Message Date
Jim Miller
fcb8042316 am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-08 15:32:40 -08:00
Jim Miller
bef827572c am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-08 15:32:09 -08:00
Adam Cohen
1b19b519e6 am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
  Attempted fix for issue 7469415
 2012-11-08 15:31:57 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
5189fca3df Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD 2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2 Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD 2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
d35f576ea0 Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD 2012-11-08 14:40:34 -08:00
Jean-Baptiste Queru
8d3d0250c4 Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11' 
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
 2012-11-08 14:40:12 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a7ccb29b11a322378002e37517abfc9 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Romain Guy
a965fc5e8f am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:14:11 -08:00
Eino-Ville Talvala
f4334f63c5 am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:14:01 -08:00
Robert Greenwalt
744c520472 am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:13:17 -08:00
Justin Koh
4608a0aec2 am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '41048d670d42075732723e72d7f303498690ea99':
  Support new touchpad event protocol.
 2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4 am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:12:26 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:12:21 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:06:37 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
768d9e1a72 Merge "Correct executable bit for source files" 2012-11-07 11:45:14 -08:00
Jim Miller
8920c259c8 am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '259e3121d301c29112dad028931d9d477264be96':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:17:33 -08:00
Jim Miller
c7dc250d5a am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:17:08 -08:00
Adam Cohen
d50f206a08 am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'a7af02098a0192b36e98c5ab809fd0f6eae9ce21':
  Attempted fix for issue 7469415
 2012-11-07 11:16:57 -08:00
Jim Miller
259e3121d3 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:14:14 -08:00
Jim Miller
fe7e94a094 am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:13:48 -08:00
Adam Cohen
a7af02098a am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
 2012-11-07 11:13:34 -08:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Elliott Hughes
fec5f611fe Merge "It's 2012. We're always WITH_JIT." 2012-11-07 09:57:16 -08:00
Baligh Uddin
20040dafbc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:38:43 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
 2012-11-06 17:43:05 -08:00
Irfan Sheriff
567a2919f3 Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 2012-11-06 17:39:46 -08:00
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -08:00
Jim Miller
51117262c8 Handle DevicePolicyManagement and safe mode when inflating widgets 
Bug 7459120
Bug 7444159
Bug 7444016

Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
 2012-11-06 17:04:26 -08:00
Romain Guy
b37e5d756f am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '7b9b41c18d0dc9d238111fa1865c72e4a5bb22cc':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:21:05 -08:00
Romain Guy
7b9b41c18d am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:23 -08:00
Romain Guy
475255bffc am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:19 -08:00
Romain Guy
1b3b2544e6 Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
9671e6e116 am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit 'e980adfd7085e99e57722e5576798c0ccdfb3f20':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:13:42 -08:00
Eino-Ville Talvala
e980adfd70 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:55 -08:00
Eino-Ville Talvala
688d98fe21 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:52 -08:00
Eino-Ville Talvala
4a1b6e4242 Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc Dismiss error icon on setError(null) [regression] 
Bug #7442935

Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
 2012-11-06 16:03:37 -08:00
Romain Guy
a1ca6d39f9 am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1 am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:55:22 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -08:00
Jean-Baptiste Queru
ecf372213d Merge eead9274 
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
 2012-11-06 15:16:09 -08:00
Robert Greenwalt
08db1ceba2 am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit 'bbe5cafeebbbd08516909a3d9d12d5d319cba345':
  Add Coin graphic to premium-sms dialog.
 2012-11-06 15:11:04 -08:00
Robert Greenwalt
bbe5cafeeb Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 2012-11-06 15:07:35 -08:00