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

211301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
eae66cd2c9 Temporary revert "Clean up phone window save/restore" 
This reverts commit 0578a725bf6905267b9caed6f5a8cedb2946e71e.

Change-Id: Ic460a0a7785a6829aab9963191714120859d36b0
 2015-08-13 20:05:35 +00:00
Alan Viverette
0578a725bf Clean up phone window save/restore 
Comment clean up, final declarations only. No functional changes.

Change-Id: Ied118bcbd0462e2bf9745dee683d9e54a9767b1a
 2015-08-13 15:31:25 -04:00
Xiaohui Chen
c91edfafac Merge "Clean up USER_OWNER in ServiceWatcher" 2015-08-12 17:46:03 +00:00
Alan Viverette
7d3cc62df8 Merge "Remove framework-private Color.HSBtoColor API" 2015-08-12 17:19:08 +00:00
Alan Viverette
7873b6da5a Remove framework-private Color.HSBtoColor API 
Bug: 22815971
Change-Id: Ic4cb43e78e0a7a6fc234865759754d106cef11dc
 2015-08-12 13:12:34 -04:00
Todd Kennedy
47c8244e4e Merge "Override package storage constraint" 2015-08-12 16:53:32 +00:00
Alan Viverette
cd703b6235 Clean up Spinner constructor docs, final class vars 
Change-Id: I8c7eef08718474bbdebe8eceaf34ebac4007d945
 2015-08-12 11:14:33 -04:00
Alan Viverette
2d2ba516e6 Merge "Pass handling context when invoking resolved click handler" 2015-08-12 12:40:48 +00:00
Narayan Kamath
ae61c26534 am 0d2e3d3e: am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '0d2e3d3ea3cd1bd0f77b3fdd8da6b17261cdd799':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 11:02:48 +00:00
Narayan Kamath
0d2e3d3ea3 am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'c42acbdb65d89b1e5fc1cafde4cbe0996c104f7a':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:55:33 +00:00
Narayan Kamath
c42acbdb65 am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '088c4155b42081e929ce07507941a197ed0a9550':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:49:49 +00:00
Narayan Kamath
088c4155b4 am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '86b6d204a5321bf2874c2cbee3452e674605c21f':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:44:38 +00:00
Narayan Kamath
86b6d204a5 am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:39:13 +00:00
Narayan Kamath
bf88205bef Fall back to persist.sys.language/country if locale isn't set. 
This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
 2015-08-12 11:03:46 +01:00
Daichi Hirono
05f40a6a9f Merge "Start to use importFile to file descriptor." 2015-08-12 08:50:25 +00:00
Daichi Hirono
2ff024f497 Start to use importFile to file descriptor. 
BUG=22908937

Change-Id: Ia4f01099816e7841e364d46c125542d006cd47a6
 2015-08-12 17:37:04 +09:00
Alex Klyubin
e20447f9b5 am 556b1f73: am 5665e040: am ab5bd5d8: am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 
* commit '556b1f7330654012e3bb868a9d7867e3331306b1':
  Add more examples of generating/importing keys to Javadocs.
 2015-08-12 06:15:15 +00:00
Alex Klyubin
556b1f7330 am 5665e040: am ab5bd5d8: am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 
* commit '5665e0405f71f61c5c8446d8af9bcf40ad907a6b':
  Add more examples of generating/importing keys to Javadocs.
 2015-08-12 06:08:11 +00:00
Alex Klyubin
5665e0405f am ab5bd5d8: am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 
* commit 'ab5bd5d83c8c26a0be5dfbda036923e67c967665':
  Add more examples of generating/importing keys to Javadocs.
 2015-08-12 06:00:39 +00:00
Alex Klyubin
ab5bd5d83c am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 
* commit 'e950a4b22caaf849bfeb68768931e0e793877119':
  Add more examples of generating/importing keys to Javadocs.
 2015-08-12 05:52:37 +00:00
Alex Klyubin
e950a4b22c am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 
* commit 'e19b76cbb50db816c535d6d4a5bf125f52c04eba':
  Add more examples of generating/importing keys to Javadocs.
 2015-08-12 05:46:35 +00:00
Alex Klyubin
e19b76cbb5 Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev 2015-08-12 05:42:29 +00:00
Lorenzo Colitti
ca0ecb44ff am 21219a7a: am 64fcffd9: am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev 
* commit '21219a7a9685c3f733230ccc0fe46d72317eb016':
  Don't attempt to stop the receive thread if we never started it.
 2015-08-12 04:14:33 +00:00
Lorenzo Colitti
21219a7a96 am 64fcffd9: am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev 
* commit '64fcffd901355a46318720d3ebaaa008d0abfe39':
  Don't attempt to stop the receive thread if we never started it.
 2015-08-12 04:07:18 +00:00
Lorenzo Colitti
64fcffd901 am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev 
* commit 'f9ddfd23ace1d140d78745d7525e62a8f5f06ff6':
  Don't attempt to stop the receive thread if we never started it.
 2015-08-12 03:59:17 +00:00
Lorenzo Colitti
f9ddfd23ac am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev 
* commit 'c7f2030ffc64bf60db020c4847fadef4c9c58ab5':
  Don't attempt to stop the receive thread if we never started it.
 2015-08-12 03:53:40 +00:00
Lorenzo Colitti
c7f2030ffc am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev 
* commit 'e022cb085f6ebc2801f843bb47c9fd23f6daa3ea':
  Don't attempt to stop the receive thread if we never started it.
 2015-08-12 03:45:30 +00:00
Lorenzo Colitti
e022cb085f Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev 2015-08-12 03:38:57 +00:00
Carlos Valdivia
70321130ab am 6d675bc8: am acd8b54b: am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev 
* commit '6d675bc8a9be502bebbb3b66982fea4d8b734ad3':
  Fix deadlock.
 2015-08-12 02:20:30 +00:00
Carlos Valdivia
6d675bc8a9 am acd8b54b: am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev 
* commit 'acd8b54b771962a23b261614a945e59f9d2f11e2':
  Fix deadlock.
 2015-08-12 02:11:40 +00:00
Carlos Valdivia
acd8b54b77 am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev 
* commit 'cbb24e24a3dca954ad417b0be1cd2709640ae90b':
  Fix deadlock.
 2015-08-12 02:03:51 +00:00
Carlos Valdivia
cbb24e24a3 am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev 
* commit '332d66538ec669f60d95416ef2224c258174ed50':
  Fix deadlock.
 2015-08-12 01:56:34 +00:00
Julia Reynolds
3322690871 am a6bce6df: am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'a6bce6df6fb7d904b766d1a754d91321b8a76bba':
  New landscape Navigation bar icons.
 2015-08-12 01:54:23 +00:00
Carlos Valdivia
332d66538e am 968fc3ab: Merge "Fix deadlock." into mnc-dev 
* commit '968fc3ab75b0de71f298c6241cab1be1e6d5c86e':
  Fix deadlock.
 2015-08-12 01:47:11 +00:00
Julia Reynolds
a6bce6df6f am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'bcca1fdd2469a21264c7697a03074476bd1479d2':
  New landscape Navigation bar icons.
 2015-08-12 01:44:42 +00:00
Carlos Valdivia
968fc3ab75 Merge "Fix deadlock." into mnc-dev 2015-08-12 01:42:19 +00:00
Julia Reynolds
bcca1fdd24 am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'edf02322bc35fb619f3149e71ddc66737787f1f4':
  New landscape Navigation bar icons.
 2015-08-12 01:40:18 +00:00
Julia Reynolds
edf02322bc am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit 'b46c2a815b2a83b139cf2b4c9ebbb03e9f774d1d':
  New landscape Navigation bar icons.
 2015-08-12 01:32:25 +00:00
Selim Cinek
1ca500cfc2 am 7f07068d: am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '7f07068df990e88e993e44d58d5c5d4acfbc7171':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:28:09 +00:00
Julia Reynolds
b46c2a815b am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev 
* commit '77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
  New landscape Navigation bar icons.
 2015-08-12 01:25:03 +00:00
Selim Cinek
7f07068df9 am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '8d97651d15821f0fc767a0f33adb6a051c55162c':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:20:06 +00:00
Julia Reynolds
77b0d6e9f0 Merge "New landscape Navigation bar icons." into mnc-dev 2015-08-12 01:19:01 +00:00
Filip Gruszczynski
f0d15a752c am d994c254: am d200aa4c: am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev 
* commit 'd994c254dafc224ca78c00f4df11cfa5e7f5c03b':
  When closing task stack remove reference to display content.
 2015-08-12 01:17:52 +00:00
Selim Cinek
8d97651d15 am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '13c9828fab18571121ec3fecca99f709d606925b':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:12:59 +00:00
Filip Gruszczynski
d994c254da am d200aa4c: am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev 
* commit 'd200aa4ca283e92268ed2d8919570ffceffa52f5':
  When closing task stack remove reference to display content.
 2015-08-12 01:10:12 +00:00
Dianne Hackborn
e337bd50e7 am 997a3688: am 4ce98e4e: am e92b1374: am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev 
* commit '997a368855117f4f3b80160bd0cc2dcc3f6841a5':
  Fix issue #23122445: Add 420 density
 2015-08-12 01:08:27 +00:00
Wale Ogunwale
b907c9678d am 0030d77f: am 0c442844: am b3a6244c: am ceada4fd: am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev 
* commit '0030d77f15717a2274f73658e6dd334101b64e55':
  Fixed issue with moveTaskToBack on single stack devices
 2015-08-12 01:08:21 +00:00
Selim Cinek
13c9828fab am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit 'c40d6799df6b3dc1c61aa05d2e356096521b7099':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:06:16 +00:00
Filip Gruszczynski
d200aa4ca2 am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev 
* commit 'a546e5be8035d31ec7549e8a549e871a180658a9':
  When closing task stack remove reference to display content.
 2015-08-12 01:04:02 +00:00
Dianne Hackborn
997a368855 am 4ce98e4e: am e92b1374: am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev 
* commit '4ce98e4e3c5db874f91f1dd91030303580fd946e':
  Fix issue #23122445: Add 420 density
 2015-08-12 01:00:56 +00:00