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

120299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
339cfdbde3 am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:57:32 +00:00
Robert Greenwalt
106627e07c am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'e42ce676f54742f2d47c26adaa90407c2cb8cec8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:54:13 +00:00
Robert Greenwalt
72f9b3084c am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:51:34 +00:00
Robert Greenwalt
e42ce676f5 am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:48:39 +00:00
Robert Greenwalt
4bc58bd255 am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:47:49 +00:00
Robert Greenwalt
c0d94e7ac6 am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:49 +00:00
Robert Greenwalt
ebf23a8d9e am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:42:32 +00:00
Robert Greenwalt
f52d1a56af am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:54 +00:00
Robert Greenwalt
74acf23a1e am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:44 +00:00
Robert Greenwalt
3c417fbf21 Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 2014-04-07 19:30:10 +00:00
Baligh Uddin
c4a80acf9c Import translations. DO NOT MERGE 
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
 2014-04-07 09:16:57 -07:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
b430ec7564 am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '7db3875cdca4c94cb667d2d0cc86718f15e3305c':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:27:25 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
 2014-04-05 04:47:14 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
 2014-04-04 16:31:08 -07:00
Narayan Kamath
5a7468f598 DO NOT MERGE Fix several bad function definitions. 
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 047b938f7188c21c07669108c5c68b2358f6b158)

Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
 2014-04-04 15:01:06 -07:00
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
f7bffe7707 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'fc8ea92df15689d51079212d7d012756ce9298d2':
  Doc Update: notification bug fix.
 2014-04-04 21:17:29 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:42:44 +00:00
Ricardo Cervera
5df825237a am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit 'ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:38:59 +00:00
Ricardo Cervera
ff3d89c08c Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 2014-04-04 17:32:57 +00:00
Ricardo Cervera
c31bd52df2 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'a821af684e2a5f814fc8709518b5f0589c81661e':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:32:42 +00:00
Ricardo Cervera
a821af684e am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit '715139a620383c89e061a2b0650e184bf3382a10':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:29:00 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053 
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
 2014-04-04 10:26:05 -07:00
Ricardo Cervera
715139a620 Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 2014-04-04 17:23:09 +00:00
Ricardo Cervera
13d49e9f36 am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit 'e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:01:35 +00:00
Ricardo Cervera
e2bdd6ae33 am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit '6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 16:55:02 +00:00
Ricardo Cervera
6ae21ea7fb Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 2014-04-04 16:51:20 +00:00
Ricardo Cervera
7f427b45bd docs: Fixed action bar example. Bug: 13806963 
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
 2014-04-04 09:46:11 -07:00
Ricardo Cervera
8866eb8155 am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit 'c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:30:02 +00:00
Ricardo Cervera
c23ab90c80 am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '07aac5e346c3fed31254e34d386c6236f1ac3f22':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:25:45 +00:00
Baligh Uddin
87210ee962 am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b285604185de1ade346eadb78971712607f54058':
  Import translations. DO NOT MERGE
 2014-04-04 14:30:55 +00:00
Baligh Uddin
ab0c43a458 am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '15fdce9d65b47e2b92bcac78776cc01486cff61a':
  Import translations. DO NOT MERGE
 2014-04-04 14:30:52 +00:00
Baligh Uddin
b285604185 am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '81e62eb1e576388866779e6f29d71614892dcf8a':
  Import translations. DO NOT MERGE
 2014-04-04 14:28:01 +00:00
Baligh Uddin
15fdce9d65 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-04-04 14:25:47 +00:00
Baligh Uddin
81e62eb1e5 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-04-04 14:22:51 +00:00
Deepanshu Gupta
53ccdf1894 am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef5caff8b53f3b8ce85277824f14936047bc11d5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:21:45 +00:00
Deepanshu Gupta
5f9887e6f1 am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'e18ae1303c070759bce117b969186f699baa8564':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:42 +00:00
Deepanshu Gupta
3e4aebdbfc am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'eca9620e331d72afa933252dc7adb1ae3ed4d692':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:21:39 +00:00
Deepanshu Gupta
2deb31ffbe am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:35 +00:00
Deepanshu Gupta
6acadebe8b am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '74ad989de6e5d62791edf15ebdbe45194cba3530':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:21:32 +00:00
Deepanshu Gupta
a53466479c am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '14dee803f8a3b532e86613bb18d5cb572d113df9':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:21:29 +00:00
Deepanshu Gupta
ef5caff8b5 am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:14:12 +00:00
Deepanshu Gupta
e18ae1303c am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:10 +00:00
Deepanshu Gupta
eca9620e33 am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:14:07 +00:00