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

128285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dmitriy Ivanov
0d54e471fa Merge "Remove code markers" 2014-04-15 19:19:53 +00:00
Dmitriy Ivanov
b8fdf8421e Remove code markers 
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
 2014-04-15 12:11:39 -07:00
quddusc
45f232cf57 am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '7ba3b3f4c87d891a2e8b55f68efd169392ff62af':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:34:31 +00:00
Katie McCormick
2aa704133a am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '76b66a9ae7a894dd30a3bab56dedb537a904157b':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:34:27 +00:00
quddusc
7ba3b3f4c8 am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit 'fe0996b7c09606fab0c1645d6c329cadf4d82841':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:29:05 +00:00
Katie McCormick
76b66a9ae7 am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2b4d89b7dcea13140b64e887b2a36042e8d491e9':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:28:59 +00:00
Tao Bai
4c22b54776 Revert "Revert "Define new general permission APIs for webview."" 
This reverts commit e0a7b08d369e323f524251a44251c902122a6414.

Change-Id: Ieba5a72524e43eb5e2fccb39647fd11e9d9494c8
 2014-04-15 18:04:49 +00:00
Tao Bai
31e052bfc4 Merge "Revert "Define new general permission APIs for webview."" 2014-04-15 18:01:43 +00:00
Tao Bai
e0a7b08d36 Revert "Define new general permission APIs for webview." 
This reverts commit 672b99c8f80177784053074d178fdea6750e82df.

Change-Id: I486b313b8cd638d5e29e2f022bba99b570a9415f
 2014-04-15 17:58:02 +00:00
Adam Powell
e107092879 am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit '50d7bfd8224f9da170dac668888bcf0831373051':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 17:57:46 +00:00
Tao Bai
e5b7c95b8a Merge "Define new general permission APIs for webview." 2014-04-15 17:37:12 +00:00
Adam Powell
50d7bfd822 DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
Applying insets is now handled by:

* WindowInsets class - Encapsulate system insets and local decor
  insets into a single object, written specifically so that new inset
  categories may be added later. Apps cannot construct their own
  WindowInsets, only clone with optional modifications. This is to
  prevent losing data in the event of new insets added in the future.

* onApplyWindowInsets - Actually perform the application of insets.

* OnApplyWindowInsetsListener - Allow an app to use a separate
  Listener object to apply insets to a View. This allows for things
  like support lib integration in custom views written for older
  versions where the verifier would otherwise complain about the use
  of the new WindowInsets class as a method parameter. It also allows
  for applying insets in a custom way without writing a custom view.

* dispatchApplyWindowInsets - Dispatch the call to self and children
  in turn, if applicable. An OnApplyWindowInsetsListener will override
  the behavior of the view's default onApplyWindowInsets method; a
  listener wishing to call down to the 'superclass' implementation as
  part of its own operation should call view.onApplyWindowInsets. App
  code should generally not override this method and instead override
  onApplyWindowInsets or provide a listener.

Compatibility support with the existing fitSystemWindows method has
been provided in both directions: for code that previously called
fitSystemWindows on arbitrary views and also for code that overrode
the fitSystemWindows method in custom views. A view that supports the
newer onApplyWindowInsets mechanism should not mix that behavior with
other calls to fitSystemWindows or vice versa. Support lib-style code
should take care to consistently use one mechanism or the other at
runtime.

Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105
 2014-04-15 10:30:25 -07:00
quddusc
fe0996b7c0 am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '60095240e2a1b1c96ee4caf6cd7e9e1fa38acbb8':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 17:12:03 +00:00
quddusc
60095240e2 docs: Updated the gradle build number to 4.3.23. 
Bug: 14043082

Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
 2014-04-15 16:57:40 +00:00
Katie McCormick
2b4d89b7dc am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit 'eca07bfaaf89d5c0280dbc44b165ee1e3ca13498':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 16:55:32 +00:00
Katie McCormick
eca07bfaaf Merge "Doc change: Update CCS doc with new quota info." into klp-docs 2014-04-15 16:52:44 +00:00
John Spurlock
14a6d6826c Merge "Migrate away from @hidden onViewAdded." 2014-04-15 16:44:01 +00:00
John Spurlock
584caa5fab Migrate away from @hidden onViewAdded. 
Change-Id: Id8c1c05a2fdeb0776a3d70e67990da1e8e93b18a
 2014-04-15 12:40:13 -04:00
Robert Ly
141b3b9c5f Merge "resolved conflicts for merge of 99c3605c to master" 2014-04-15 16:15:34 +00:00