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

7336 Commits

Author SHA1 Message Date
Alan Viverette
dcdce7730b Merge "Material theme" 2014-06-06 22:49:21 +00:00
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Tim Murray
08d3775cbe am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
 2014-06-06 22:41:22 +00:00
Tim Murray
7fa0e6bc69 Merge "Change flags to use int instead of long." into lmp-preview-dev 2014-06-06 22:36:49 +00:00
Matt Casey
c4cbf54c29 Merge "Make MediaStore.Audio.Radio not instantiable" 2014-06-06 22:27:39 +00:00
Alan Viverette
1abd798db9 Merge "DO NOT MERGE Material theme" into lmp-preview-dev 2014-06-06 21:56:51 +00:00
Alan Viverette
3cb07a462b DO NOT MERGE Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 14:19:53 -07:00
Jason Monk
f10606a9a4 Merge "Add device-owner based setting of global proxy." 2014-06-06 20:50:23 +00:00
Jason Monk
03bc991834 Add device-owner based setting of global proxy. 
Re-hide the setGlobalProxy on the ConnectivityManager as it requires
CONNECTIVITY_INTERNAL.  Instead add a function to the DevicePolicyManager
to set the global proxy, that can only be called by the device owner.

Change-Id: I9ffb2cc4f30a6dc9b868d86f056e1fbd512d8dfc
 2014-06-06 16:43:17 -04:00
Svetoslav
bb1b857841 Merge "Refactor printing" 2014-06-06 20:36:50 +00:00
Svetoslav
a798c0a984 Refactor printing 
Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
 2014-06-06 13:33:16 -07:00
Jim Miller
a4b882f60c Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev 2014-06-06 19:40:43 +00:00
Dianne Hackborn
d8883df650 am 87bc3c25: Merge "Improvements to low power mode." into lmp-preview-dev 
* commit '87bc3c258d8be516bc0fcedeb6eec34088582061':
  Improvements to low power mode.
 2014-06-06 18:26:17 +00:00
Tim Murray
fd710e705a Change flags to use int instead of long. 
bug 15429629

Change-Id: Ideb983b17aa3c146d23f2be6bb0e9808cb6725b7
 2014-06-06 11:10:45 -07:00
Dianne Hackborn
421e2fd044 Merge "Improvements to low power mode." into lmp-preview-dev 2014-06-06 17:46:11 +00:00
Dianne Hackborn
eb94fa7975 Improvements to low power mode. 
Add new public API for monitoring low power mode.

BatteryService now puts device in to low power mode when
battery level is low.

Window manager now watches low power mode to turn off
animations.

Modifying the animator scale now gets propagated to all
processes.

Change-Id: I8fa566994764ddd4e1977631e28381ab9409f8ee
 2014-06-06 10:25:36 -07:00
Matt Casey
de6f4701f8 Make MediaStore.Audio.Radio not instantiable 
Types which only contain constants or static methods should
not be instantiable.

Bug: 15430601
Change-Id: I515740e677ae4c72afc09e943e20a72ea27cb17e
 2014-06-06 10:16:15 -07:00
Yorke Lee
282129fd3f API changes to Telephony per API review 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
 2014-06-06 09:29:32 -07:00
George Mount
cb0462d36f am 2c9ce97c: Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 
* commit '2c9ce97c340393cb9fcb49d4163ab7d40f434186':
  API review: Constants to Gravity and Epicenter.
 2014-06-06 14:52:18 +00:00
George Mount
d23d509726 Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 2014-06-06 13:59:27 +00:00
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
 2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
 2014-06-06 12:36:13 +00:00
Nicolas Prevot
a61fbbd0c3 Merge "Adding an extra and an action to notify the mdm to start the provisioning." 2014-06-06 11:18:10 +00:00
Nicolas Prevot
07ac20bb2c Adding an extra and an action to notify the mdm to start the provisioning. 
Adding EXTRA_PROVISIONING_EMAIL_ADDRESS and ACTION_START_PROVISIONING to DevicePolicyManager.

BUG: 15157562

Change-Id: Ic3ecc6b0a501e1df9a5f803a44347dd024a7a07c
 2014-06-06 12:00:17 +01:00
Dongwon Kang
7012db741c Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 2014-06-06 06:59:17 +00:00
Dongwon Kang
2750d21d8b Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 2014-06-06 06:58:02 +00:00
Ed Heyl
608445608a fix build; undo automerger side affect 
Change-Id: I30da1c85dd67f62f94ddd436a9268eeaa717d7fc
 2014-06-05 22:39:36 -07:00
Jim Miller
2c1de5b052 Hide the fingerprint API for now. DO NOT MERGE 
Change-Id: I78aadf8d03be74eb862c5fe120fa544a2483553c
 2014-06-05 19:37:42 -07:00
Aravind Akella
acbf10ce5c Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev 2014-06-06 01:57:25 +00:00
Evan Charlton
acb28a7af7 Merge "Fix the build breakage (update API & javadocs)" 2014-06-06 00:50:35 +00:00
Raph Levien
748a3779f3 am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 
* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
 2014-06-06 00:45:43 +00:00
Raph Levien
5b29e12cfb Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 2014-06-06 00:42:34 +00:00
Evan Charlton
7960fd917a Fix the build breakage (update API & javadocs) 
Update API and Javadocs to fix the build.

Change-Id: I108e4d824eabb68f8edd864bf67a16188672b01b
 2014-06-05 17:31:11 -07:00
Jae Seo
b8a64416e5 TIF: Address the feedback from the API review - 2/3 
This change addresses the following comments from the council:
- Change the TvView API to be tune(String inputId, Uri channelUri) and
  reset()
- @hide TvInputSession class, including createSession() and
  SessionCallback
- Define a listener interface specific to TvView, allowing you to hide
  the session details and keep the API simpler.  Add
  setTvInputListener().

Bug: 15345342
Change-Id: I931662841b41d862ebc4a700ccb245889a5f87a5
 2014-06-06 09:13:28 +09:00
Yin-Chia Yeh
abfaf964a5 am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor
 2014-06-05 23:37:07 +00:00
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
 2014-06-05 23:21:03 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
Yorke Lee
8c2d8c0c27 Revert "API changes to Telephony per API review" 
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
 2014-06-05 22:55:49 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
 2014-06-05 22:39:11 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public 
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
 2014-06-05 22:30:37 +00:00
Aravind Akella
5271e0b890 Hide Sensor.getRequiredPermission API. 
Bug: 15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit e7213150abbe33c71dbdc3295a1fa1feaafb069d)
 2014-06-05 22:24:25 +00:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
 2014-06-05 22:23:11 +00:00
Yorke Lee
f537259ec4 am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev 
* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review
 2014-06-05 22:23:03 +00:00
Ji-Hwan Lee
cc15afbe12 Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 2014-06-05 22:12:08 +00:00
Yorke Lee
66c11e1f84 Merge "API changes to Telephony per API review" into lmp-preview-dev 2014-06-05 22:02:22 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
 2014-06-05 21:00:32 +00:00
Yorke Lee
d8819baf85 API changes to Telephony per API review 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
 2014-06-05 13:48:12 -07:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils 
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
 2014-06-05 13:45:15 -07:00