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

150782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
80ab66574a am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '676fedb03498436cf6551ea9e0ae5486e7fe9e0c':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:20:24 +00:00
Esteban Talavera
29c6dfe446 am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '4536f11f64b6fa2d99f65424819f20401d2c0830':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:20:19 +00:00
Esteban Talavera
de7706999e am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:20:15 +00:00
Jorim Jaggi
7ff086fdff am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'fa4b90b870980baa42ff868d2d331effae70956d':
  Update notification layouts to match redlines
 2014-08-21 16:20:09 +00:00
Kenny Guy
98ecaa1ae6 am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '87c29bd1b08b48b093808b8831bc23de69f9d318':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:13:54 +00:00
Esteban Talavera
b676afcacf am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit 'a47533ff3c3fdd6ad0d81266e75403eb441be141':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:13:44 +00:00
Esteban Talavera
da3b8a493a am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit '3e02b271fcea87e07534712127fad60b0ce92dab':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:13:39 +00:00
Jorim Jaggi
9921de0df1 am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'af1c312d19d9b786b2edc1e83d4688870a51ef17':
  Update notification layouts to match redlines
 2014-08-21 16:13:34 +00:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Naveen Kalla
208fc81aa0 am 7fe44c06: am 30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
* commit '7fe44c068c05de1f1e721b4c268b0fedb7616d9e':
  Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
 2014-08-21 15:23:36 +00:00
Esteban Talavera
e17fce679a am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '82e2dd5457724811141d54d124505d3130eba29b':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:23:27 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Kenny Guy
6460657d0e Replicate text and sounds settings for managed profile. 
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
 2014-08-21 16:19:35 +01:00
Esteban Talavera
d449f101d1 am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '87d536ab13bda0ebd1a8f7d28f8b11c895debff4':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:15:10 +00:00
vandwalle
5197859685 am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit '01c23ffbf8f50e4a8d3889c05ebb459a82e0a930':
  per bssid blacklist
 2014-08-21 15:15:06 +00:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02:00
Naveen Kalla
74eedc2a72 am 30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
* commit '30e6a232769fba0cc08a5e783582858c4b4add0d':
  Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
 2014-08-21 15:12:09 +00:00
Esteban Talavera
ae4af39504 am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit 'a2cdeadd322a1d2cb0778fa44eee61fcd0aa1e41':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:12:05 +00:00
Naveen Kalla
bd7723637b Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
 2014-08-21 15:08:22 +00:00
Esteban Talavera
a5a69a3f89 am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '5f9653cec90ad88d94ee5c31b5de6010c4fb97a1':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:02:32 +00:00
vandwalle
a37f2592dd am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit '23e258519b3c6e479bd748ce7bab624ca1ab088c':
  per bssid blacklist
 2014-08-21 15:02:28 +00:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
20303426ac Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 2014-08-21 14:58:07 +00:00
vandwalle
beec21522d Merge "per bssid blacklist" into lmp-dev 2014-08-21 14:55:12 +00:00
John Reck
e4d7d34761 am 872c7679: am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit '872c7679bc5461d2fdb26ffeb091b88bc912b77b':
  Run RevealAnimator on RT
 2014-08-21 14:34:18 +00:00
Esteban Talavera
8cce064f1b am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '50a84946336e747378ea8f09ff1bf3d6fb457ebe':
  Remove setApplicationsHidden
 2014-08-21 14:34:13 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
John Reck
d5f826b4c1 am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit 'd6a934a9a86a293428ccff8b78eba42825dd09f8':
  Run RevealAnimator on RT
 2014-08-21 14:29:25 +00:00
Esteban Talavera
ed8cf270ae am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '58dada0df65027cad970351b981f526e80052aef':
  Remove setApplicationsHidden
 2014-08-21 14:25:07 +00:00
Jason Monk
87f687830d am d96d3340: am c93cf56b: Merge "Update VPN Icon to key." into lmp-dev 
* commit 'd96d334012d7c2098730836e1e33d0fb0710e68c':
  Update VPN Icon to key.
 2014-08-21 14:24:52 +00:00
Jason Monk
ce6e75bb43 am ee986895: am e34fef3b: Don\'t stack toasts for every user press 
* commit 'ee9868955b11f44c37970fa9309928d11d199ec2':
  Don't stack toasts for every user press
 2014-08-21 14:24:48 +00:00
John Reck
94f6878bbd Merge "Run RevealAnimator on RT" into lmp-dev 2014-08-21 14:23:29 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Jason Monk
bd0cd6fe30 am c93cf56b: Merge "Update VPN Icon to key." into lmp-dev 
* commit 'c93cf56b7852120fc32d6e742a91a49efc9f5499':
  Update VPN Icon to key.
 2014-08-21 14:15:09 +00:00
Jason Monk
d0be70b407 am e34fef3b: Don\'t stack toasts for every user press 
* commit 'e34fef3b40889f30891fe12ff441edaa48544a7f':
  Don't stack toasts for every user press
 2014-08-21 14:15:03 +00:00
Jason Monk
e8847bd831 Merge "Update VPN Icon to key." into lmp-dev 2014-08-21 14:06:53 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Jason Monk
07f82b7942 Don't stack toasts for every user press 
Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.

Also fix unlock strings to not use insertions because of problems
translating the context.

Bug: 16892731
Bug: 16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc
 2014-08-21 09:42:42 -04:00
Esteban Talavera
1aee98fbf3 Updated documentation for setScreenCaptureDisabled() 
As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
 2014-08-21 14:03:55 +01:00
Ji-Hwan Lee
4de7005843 am ed360234: am 155bf68b: TIF: Release main TvView on reset() 
* commit 'ed3602348060ea049c159a87a6058c086021b804':
  TIF: Release main TvView on reset()
 2014-08-21 12:26:24 +00:00
Adrian Roos
e2ed541a7d am 3ee83961: am 4f933f8b: Merge "Fix broken brightness mirror" into lmp-dev 
* commit '3ee839611275b5107512f3b8e457534e7990c2fb':
  Fix broken brightness mirror
 2014-08-21 12:17:09 +00:00
Ji-Hwan Lee
7eb1a44dba am 155bf68b: TIF: Release main TvView on reset() 
* commit '155bf68b24989edd4600cb018e2f9efd4f75fd6f':
  TIF: Release main TvView on reset()
 2014-08-21 12:16:59 +00:00
Ji-Hwan Lee
c7f440dcd8 TIF: Release main TvView on reset() 
Also, use WeakReference for TvView.sMainTvView.

Change-Id: I6eec1c9f907692f0fbfa96d80c7d1141eabde6e2
 2014-08-21 12:11:50 +00:00
Adrian Roos
3243c10402 am 4f933f8b: Merge "Fix broken brightness mirror" into lmp-dev 
* commit '4f933f8b0b0a28bd225042d4fb7b55ab19c81319':
  Fix broken brightness mirror
 2014-08-21 12:08:25 +00:00
Adrian Roos
0e7d37656f Merge "Fix broken brightness mirror" into lmp-dev 2014-08-21 11:58:44 +00:00
Adrian Roos
73cec7e823 Fix broken brightness mirror 
Bug: 17136823
Change-Id: I5609b2d539db56ec235899c069a080c8a959d254
 2014-08-21 13:57:48 +02:00
Niels Egberts
8f4c0ef2ce am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '3709bca86d7a24173f87e476fd2032ef303a766a':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 11:49:42 +00:00
Niels Egberts
dff817bf45 am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '14e9dc50e3a787c926e3d56e854945fc96b5d500':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 11:39:49 +00:00