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

127509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
a111328412 Don't auto scroll empty lists 
BUG: 12930741
Change-Id: I22bcebace0d5e0d519d38b34d6312ffff5b62f9b
 2014-04-07 09:30:13 -07:00
George Mount
6fd0ef7f73 Merge "Add Transitions useful for Activity transitions." 2014-04-07 16:17:40 +00:00
George Mount
dde10d073f Merge "Implement "Back" for Activity Transitions." 2014-04-07 16:17:32 +00:00
Baligh Uddin
c4a80acf9c Import translations. DO NOT MERGE 
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
 2014-04-07 09:16:57 -07:00
George Mount
d6107a3170 Add Transitions useful for Activity transitions. 
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders

Moved capability from Fade to Visibility.

Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
 2014-04-07 09:14:09 -07:00
Baligh Uddin
016409812a Import translations. DO NOT MERGE 
Change-Id: I5aca3127cc5a9cde5f594d7d12fe0bd2c7a764f4
Auto-generated-cl: translation import
 2014-04-07 09:09:09 -07:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Raph Levien
77b1286f7f Merge "Fix extra text appearing after ellipsis" 2014-04-07 15:27:12 +00:00
Alexandra Gherghina
45849beb3b Merge "Introduces intents for adding and removing a managed profile." 2014-04-07 12:26:56 +00:00
Alexandra Gherghina
c17d7e0d64 Introduces intents for adding and removing a managed profile. 
Change-Id: I6b8b7a314ea52bfd0c750da94066156e73a0f2f5
 2014-04-07 12:38:24 +01:00
Kenny Guy
2eadb856d0 Merge "Launch recents with the correct user." 2014-04-07 10:54:58 +00:00
Jaewan Kim
baa00cc350 Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 2014-04-07 09:01:43 +00:00
Jaewan Kim
6789797485 Revert "Refactor IpConfiguration from WifiConfiguration" 
This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
 2014-04-07 09:01:24 +00:00
Jaewan Kim
e277433ed7 Revert "Hide IpConfiguration" 
This reverts commit d07372e2e96ed6d2012db8518e05018c9710cafb.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
 2014-04-07 08:54:45 +00:00
Jaewan Kim
d07372e2e9 Hide IpConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
 2014-04-07 17:11:39 +09:00
Jaewan Kim
ce245e1c65 Merge "Refactor IpConfiguration from WifiConfiguration" 2014-04-07 04:40:45 +00:00
Jaewan Kim
1284767ceb Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
 2014-04-07 11:35:35 +09:00
quddusc
e49ba1a3fc am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'f403d60fc8dfe2b833a65b6933a07c44d849e831':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:45:01 +00:00
quddusc
f403d60fc8 am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:38:52 +00:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
b430ec7564 am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '7db3875cdca4c94cb667d2d0cc86718f15e3305c':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:27:25 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Etienne Le Grand
8bd72e5033 am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'acf395fd9441bce9fbe68c1b7efbf824570284bc':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 17:05:38 +00:00
Etienne Le Grand
acf395fd94 am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 09:05:50 +00:00
Etienne Le Grand
fa1d2417d2 Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
 2014-04-05 06:14:24 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
 2014-04-05 04:47:14 +00:00
Etienne Le Grand
ded2647330 am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'bdfe384106de364ea2effac6ab80108556d11649':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 03:53:49 +00:00
Fabrice Di Meglio
738691d610 Add support for key value for SearchIndexableData 
- add member "key" which enabled retrieval of the data

Change-Id: Idfa835a5afd6ffa27c7592b79f9da46f0d056c9b
 2014-04-04 19:14:46 -07:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 01:52:27 +00:00
Christopher Tate
706f50c3ab Merge "Back up the preferred home app, if any" 2014-04-05 01:27:09 +00:00
Deepanshu Gupta
1cb3e81421 Merge "Fix sdk build" 2014-04-05 01:06:00 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build 
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
 2014-04-04 18:02:57 -07:00
Christopher Tate
a99d02170b Back up the preferred home app, if any 
If the user has stated a preference about their home app, make sure we
capture that so that a system restore can return them to that preferred
situation.  It's built into the system metadata so that we can, if
necessary, fast-path configuration of that home app while the rest of
the restore operation is in flight.

Change-Id: I64dfee8f7a2a9e40f556cd19298d7b367c6aa8dc
 2014-04-04 17:40:34 -07:00
Michael Wright
118d113478 Merge "Fix size_t format specifier" 2014-04-04 23:51:36 +00:00
Nick Kralevich
55e86a78a6 am 8e2a4b53: am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '8e2a4b539509f03c4b3521574a910f2ea3296a66':
  Always call super.onCreate().  Always.
 2014-04-04 23:37:53 +00:00
Ruchi Kandoi
654d75fec9 PowerManager: Fix build 
fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
 2014-04-04 16:34:56 -07:00
Nick Kralevich
8e2a4b5395 am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
  Always call super.onCreate().  Always.
 2014-04-04 23:31:44 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
 2014-04-04 16:31:08 -07:00
Nick Kralevich
4ed27328b5 am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit 'dc97144b3f83bf6dae90493a6631afc6523dfce2':
  Always call super.onCreate().  Always.
 2014-04-04 23:25:52 +00:00
Nick Kralevich
dc97144b3f Merge "Always call super.onCreate(). Always." 2014-04-04 23:18:46 +00:00
Christopher Tate
5eab368c4d Always call super.onCreate(). Always. 
Bug 12991134

(cherrypick of commit 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)

Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
 2014-04-04 23:06:13 +00:00
Michael Wright
9ecba5269b Fix size_t format specifier 
Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
 2014-04-04 15:29:53 -07:00
Narayan Kamath
5a7468f598 DO NOT MERGE Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 047b938f7188c21c07669108c5c68b2358f6b158)

Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
 2014-04-04 15:01:06 -07:00
Katie McCormick
6652b98339 am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502':
  Doc Update: notification bug fix.
 2014-04-04 21:41:49 +00:00
Katie McCormick
de4fedefbf am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit '8e63696a73dfebae9b2ec123611db6b21968dbfd':
  Doc Update: notification bug fix.
 2014-04-04 21:35:50 +00:00
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
f7bffe7707 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'fc8ea92df15689d51079212d7d012756ce9298d2':
  Doc Update: notification bug fix.
 2014-04-04 21:17:29 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
Deepanshu Gupta
bfec73c2db Fix theme/style resolution in Layoutlib 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
 2014-04-04 13:44:22 -07:00