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

52423 Commits

Author SHA1 Message Date
Dianne Hackborn
e294f40b1d am 50bfc3ac: Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" 
* commit '50bfc3ac0fadbb5413e9de07141d1eff4fc7321e':
  [system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close
 2014-06-09 15:55:18 +00:00
Robin Lee
a54c8246a5 am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId
 2014-06-09 14:47:04 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
George Mount
446956f789 Merge "Capture right/bottom of images properly when doing Activity Transitions." 2014-06-09 13:50:14 +00:00
Nicolas Prevot
e8b8f99dde Merge "Updating documentation for the flags of addCrossProfileIntentFilter" 2014-06-09 13:01:09 +00:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
 2014-06-09 12:55:13 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId 
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
 2014-06-09 12:45:17 +00:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
Jessica Hummel
9da603973b Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
 2014-06-09 13:01:03 +01:00
Nicolas Prevot
41d926e3e4 Updating documentation for the flags of addCrossProfileIntentFilter 
Change-Id: I32ed07aecdc8009cbb5708777da5085feabfd4ef
 2014-06-09 11:55:23 +01:00
Calin Juravle
66e29d08c7 am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
  Fixed comments related to profile properties.
 2014-06-09 10:05:04 +00:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
 2014-06-09 09:56:37 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs 
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
 2014-06-09 18:30:02 +09:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties. 
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
 2014-06-09 10:13:55 +01:00
Robert Greenwalt
cc62d9ad6b Merge "Apply API review to android.net.Network:" 2014-06-08 23:41:27 +00:00
Robert Greenwalt
df2b878ff4 Fix public API of LinkProperties. 
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
 2014-06-08 12:54:23 -07:00
Paul Jensen
6d3ff9ea3a Apply API review to android.net.Network: 
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
 2014-06-08 12:09:18 -07:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00
Dianne Hackborn
000cdd5fe5 Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev 2014-06-07 17:33:18 +00:00
Igor Murashkin
09c0d2618c am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 
* commit 'f6c66902392ae7fcfd44fe90fc43b08b21db2e10':
  util: Make Rational a Number/Comparable; add Range#inRange
 2014-06-07 12:26:23 +00:00
Todd Poynor
c42ef37e28 am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev 
* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update
 2014-06-07 10:01:10 +00:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master 
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
 2014-06-06 21:13:28 -07:00
Baligh Uddin
7892a49615 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:36 +00:00
Baligh Uddin
d29b822d9b Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Ari Sachter-Zeltzer
7e3357a56d [system transitions] 
+ merge all transition work into new branch for commiting to master
+ new task switching animations to support doc-centric recents
+ new default activity transitions
+ new app -> home (wallpaper close)
+ updated fragment close

Change-Id: If055e454e7e7bf11c7d54c8cacad8f7ec52d12d1
 2014-06-06 19:48:36 -07:00
Igor Murashkin
2f98a26bbf Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 2014-06-07 00:35:36 +00:00
Igor Murashkin
007bfb14d2 util: Make Rational a Number/Comparable; add Range#inRange 
* Also changes Rational to reduce the numerator/denominator by
its greatest common divisor at construction time (e.g. (2/4 -> 1/2)).

Bug: 15432042
Change-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d
 2014-06-06 16:38:09 -07:00
Todd Poynor
407a403402 Merge "BatteryManager: battery property query API update" into lmp-preview-dev 2014-06-06 23:16:16 +00:00
Craig Mautner
3c9f70dc86 Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev 2014-06-06 23:14:32 +00:00
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
Jeff Brown
a18d0acc1f Merge "Rename PrivateApi annotation to SystemApi." 2014-06-06 22:38:54 +00:00
Matt Casey
c4cbf54c29 Merge "Make MediaStore.Audio.Radio not instantiable" 2014-06-06 22:27:39 +00:00
Jeff Brown
d5a5b5a547 Rename PrivateApi annotation to SystemApi. 
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
 2014-06-06 15:16:27 -07:00
Alan Viverette
1abd798db9 Merge "DO NOT MERGE Material theme" into lmp-preview-dev 2014-06-06 21:56:51 +00:00
Chris Craik
7f8d1c3f3e am 493ae7d7: Add doc for View.getElevation() 
* commit '493ae7d7aa547f366c6de244f5535ba2c0417598':
  Add doc for View.getElevation()
 2014-06-06 21:23:40 +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
b0dced8173 Add an API to clear the device owner. 
Only the device owner will be able to clear itself.

Change-Id: Ie3231467d92e8c5d22ec51256177793f34110432
 2014-06-06 17:03:43 -04:00
Alan Viverette
f7807bf566 am fe0b773c: Make the action bar dark in DarkActionBar theme 
* commit 'fe0b773cd787b7326729d06d8e54c341f5cb12a6':
  Make the action bar dark in DarkActionBar theme
 2014-06-06 20:57:29 +00: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
Chris Craik
5985dfbf14 Add doc for View.getElevation() 
Change-Id: I5a843969fa03db6bb0faef80962c1256c64aa450
 2014-06-06 13:40:22 -07: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
Raph Levien
df8427c324 Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches" 2014-06-06 20:15:27 +00: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
Alan Viverette
2987eefe09 Make the action bar dark in DarkActionBar theme 
Change-Id: I9f574bac1446fab88c0db1c7f9a45f50f73e3311
 2014-06-06 12:16:29 -07: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
Dianne Hackborn
421e2fd044 Merge "Improvements to low power mode." into lmp-preview-dev 2014-06-06 17:46:11 +00:00