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

128462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
1723d6fef6 Remove activitystrings.xml from localized resource directories 
Change-Id: I57fe2e6f60fcebd77118f15db9d06b0f2df56d7c
 2014-04-16 10:35:49 -07:00
Winson Chung
fe08369d8c Merge "Fixing the alternate recents transition on landscape views." 2014-04-16 17:25:59 +00:00
Winson Chung
2820c4523c Fixing the alternate recents transition on landscape views. 
- This still assumes that we are taking square thumbnails.

Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
 2014-04-16 09:56:42 -07:00
Christoph Studer
8fd7f1ed7c Rename basePkg to opPkg 
...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
 2014-04-16 18:51:25 +02:00
Baligh Uddin
3eff39fb0f Merge "Revert "Import translations. DO NOT MERGE"" 2014-04-16 16:10:08 +00:00
Baligh Uddin
abe94cf196 Revert "Import translations. DO NOT MERGE" 
This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a.

Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
 2014-04-16 16:09:58 +00:00
Christoph Studer
97096fd0e6 Merge "Write eventlog entries for notification visibility" 2014-04-16 15:49:54 +00:00
Baligh Uddin
7553434472 am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e65c292a5e7f4d70a43f965909647f89bb46809d':
  Import translations. DO NOT MERGE
 2014-04-16 15:34:04 +00:00
Baligh Uddin
e65c292a5e am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f104f676e375c5c53eb049705740ab592b914bda':
  Import translations. DO NOT MERGE
 2014-04-16 15:31:02 +00:00
Baligh Uddin
f104f676e3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-16 15:28:29 +00:00
Baligh Uddin
3471e80349 Merge "Import translations. DO NOT MERGE" 2014-04-16 15:27:00 +00:00
Baligh Uddin
da7cc2c42d Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:24 +00:00
Baligh Uddin
cf8aed657b Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:20 +00:00
Christoph Studer
92b389da2a Write eventlog entries for notification visibility 
Keep track of notifications shown in the notification panel
and log them via eventlog.

Added the following eventlog tag:
  * notification_visibility_changed

Bug: 13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
 2014-04-16 17:07:49 +02:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Dongwon Kang
781c55fda2 Merge "Handle the failure of session creation request in TvInputManagerService." 2014-04-16 06:56:22 +00:00
Dongwon Kang
fd5b72f1ed Handle the failure of session creation request in TvInputManagerService. 
Bug: 14073508
Change-Id: Idc9da323bb0000300faf662c7db031214ae6136c
 2014-04-16 14:23:25 +09:00
Wink Saville
070e061a28 Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event 
Also added DataConnectionRealTimeInfo structure which passed as a
parameter to onDataConnectionRealTimeInfoChanged.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
 2014-04-15 22:04:10 -07:00
Deepanshu Gupta
bdd0ad79b9 Layoutlib tests now check methods return value [DO NOT MERGE] 
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
 2014-04-15 20:03:20 -07:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
 2014-04-15 20:03:19 -07:00
Deepanshu Gupta
1b87390c94 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
Adds MenuBuilderAccessor in addition to the cherry-picked changes.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)
 2014-04-15 20:02:49 -07:00
Deepanshu Gupta
4ccc4bd54f Action bar rendering in layoutlib [DO NOT MERGE] 
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.

This also relies on some changes to the plugin to pass the correct params.

Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 14bf0cef7eeed572a67c29a328581afac4decc20)
 2014-04-15 20:02:48 -07:00
Deepanshu Gupta
acf0bce09f Support custom views using TimePickerDialog [DO NOT MERGE] 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit 86e5218220a0e01f7eb574a2480bd91f9ebfae35)
 2014-04-15 19:53:54 -07:00
Alan Viverette
8b53023a83 Merge "Fix action bar theme inheritance and icons, make colors public" 2014-04-16 01:24:51 +00:00
Alan Viverette
548ea547b9 Fix action bar theme inheritance and icons, make colors public 
Theme.Quantum.Light.DarkActionBar is still broken, but fix incoming.

BUG: 14084633
BUG: 14083272
Change-Id: Id5f2f9ce5b0af741fc79d1fb325cfee74c7a1e37
 2014-04-15 18:21:20 -07:00
John Spurlock
2d6196e4d2 Merge "Add 'read' subcommand to the 'content' tool." 2014-04-16 00:10:00 +00:00
Christopher Tate
9187e40b16 Merge "Don't crash if a null key is passed for verification/parsing" 2014-04-15 23:59:46 +00:00
Vinod Krishnan
6f23e6d622 am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit 'da34482dfc879e741f1ab2f64a0c1741640186da':
  Set wearable specific strings in framework
 2014-04-15 23:51:48 +00:00
Vinod Krishnan
da34482dfc am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit '56a90cb8e1a136d6367c0006bf8689fcc97211cb':
  Set wearable specific strings in framework
 2014-04-15 23:48:24 +00:00
Vinod Krishnan
56a90cb8e1 Merge "Set wearable specific strings in framework" into klp-modular-dev 2014-04-15 23:45:26 +00:00
Dmitriy Ivanov
d7cc9e3163 am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
  Remove code markers
 2014-04-15 23:36:27 +00:00
quddusc
23846c6380 am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '45f232cf579a1b4f8e32da08f17b7b7eb20ddc18':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 23:36:13 +00:00
Katie McCormick
0b09a76624 am 2aa70413: am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2aa704133a914f4a8455862d74cc450b267f1b9a':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 23:36:08 +00:00
Todd Poynor
fb5c8baba5 Merge "Context: fixup wrong Javadoc link for BatteryManager" 2014-04-15 23:33:42 +00:00
John Spurlock
cee823e4d4 Add 'read' subcommand to the 'content' tool. 
Access raw content exposed by content provider
openFile uris.

Bug:14079104
Change-Id: I9ef0e19f9354fa12408df1583b211a8d8a2e9fdb
 2014-04-15 19:28:08 -04:00
Adam Powell
02c4949850 am e1070928: (-s ours) am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit 'e1070928795210a1894a454ff88e9d529ca381a7':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 23:20:37 +00:00
quddusc
ed2aad7bff Merge "resolved conflicts for merge of 99c3605c to master" 2014-04-15 23:19:16 +00:00
quddusc
861d6348de resolved conflicts for merge of 99c3605c to master 
Change-Id: I76383ec78cec780566256e709d3cbc371c3bd73d
 2014-04-15 16:18:01 -07:00
Jim Miller
4c4fc3e172 Merge "Default to PASSWORD_QUALITY_UNSPECIFIED" 2014-04-15 23:13:24 +00:00
Todd Poynor
99f7e125b0 Context: fixup wrong Javadoc link for BatteryManager 
Change-Id: I3dec0a359185fd9bfc78d98f8232ff64e6a784dd
 2014-04-15 16:05:49 -07:00
Alan Viverette
4554a6a513 Implement jumpToCurrentState() in VectorDrawable 
BUG: 14083130
Change-Id: Ie1842b2367d1f24d18fdbc71963e077a1805de9b
 2014-04-15 15:53:01 -07:00
Alan Viverette
a17bfe04a7 Merge "Allow clamped bound position to be INVALID_POSITION" 2014-04-15 22:17:28 +00:00
Alan Viverette
875f4c2918 Allow clamped bound position to be INVALID_POSITION 
Change-Id: Idd392e41cb8df31e2933851fa6abd87fc3e2001b
 2014-04-15 15:16:48 -07:00
Todd Poynor
7a8e3fcd3c Merge "BatteryManager: Add API and service for battery property retrieval" 2014-04-15 22:16:13 +00:00
Youngsang Cho
7ec8b21a06 Merge "Remove TvInputSession" 2014-04-15 21:32:16 +00:00
Youngsang Cho
674e96216d Remove TvInputSession 
TvInputSession is not used anymore. Instead, TvInputManager.Session
and TvInputService.TvInputSessionImpl are used.

Change-Id: Id252afa76b4ef45f561b1d20095ee235a9fdccf8
 2014-04-15 14:25:36 -07:00
Todd Poynor
e35872da97 BatteryManager: Add API and service for battery property retrieval 
Add service "batterymanager" and method getProperty to retrieve
battery properties.  This is a public API.

Make BatteryProperty public.  Cleanups for public-facing API.

Change-Id: I3637d131aabe4811dff40661728d5353eaf854c4
 2014-04-15 13:54:08 -07:00
Christopher Tate
3014733c8c Don't crash if a null key is passed for verification/parsing 
Change-Id: I77c496d9d86d2831a4166a924afe1493aa0ac0ce
 2014-04-15 12:57:47 -07:00
Dmitriy Ivanov
5c04c4e7b5 am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
  Remove code markers
 2014-04-15 19:26:34 +00:00
Dmitriy Ivanov
6ced3b34f0 am 0d54e471: Merge "Remove code markers" 
* commit '0d54e471fa90c2759e86dc47c642f7af277a50f0':
  Remove code markers
 2014-04-15 19:23:20 +00:00