Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,570 Commits 3 Branches 0 Tags
365c55cb9a514b514b494b026b4dfbdfa7ce4250
Commit Graph

120570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
365c55cb9a Merge "use relative positioning for notification actions" 2013-12-03 22:30:04 +00:00
Chris Wren
8749ac8a4c use relative positioning for notification actions 
Bug: 10531101
Change-Id: I5a55f708d9ffae3ec3582f85c2ff47aa6afa287d
 2013-12-03 22:29:50 +00:00
John Spurlock
b4de207bc3 Merge "Move moveable non-public framework resources up to SystemUI" 2013-12-03 22:19:06 +00:00
Dianne Hackborn
9f4c54c294 Merge "Fix issue #11536426: Permission denied when trying to launch..." 2013-12-03 21:04:09 +00:00
Leon Scroggins III
ece57d7d78 Merge "Remove call to deprecated function." 2013-12-03 18:40:30 +00:00
Dirk Dougherty
533693feb4 am efbc4aeb: am 31c041a5: am 1c64e2f4: Add samples TOC generated from browsable sources. 
* commit 'efbc4aeb4a39d99db8d8a8d6b576f9fc2b8f098f':
  Add samples TOC generated from browsable sources.
 2013-12-03 17:56:56 +00:00
Dirk Dougherty
efbc4aeb4a am 31c041a5: am 1c64e2f4: Add samples TOC generated from browsable sources. 
* commit '31c041a58315eca907192411905273e88dbc2f8f':
  Add samples TOC generated from browsable sources.
 2013-12-03 17:53:12 +00:00
Dirk Dougherty
31c041a583 am 1c64e2f4: Add samples TOC generated from browsable sources. 
* commit '1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d':
  Add samples TOC generated from browsable sources.
 2013-12-03 09:51:05 -08:00
Glenn Kasten
ab76e3b549 Merge "Update comments for AudioRecord IllegalArgumentException" 2013-12-03 16:14:38 +00:00
Alan Viverette
06f37728b9 Merge "Generalize mapping between local and global View coordinates" 2013-12-03 02:42:34 +00:00
Alan Viverette
a3e0a30c26 Merge "Apply theme to PreferenceActivity headers" 2013-12-03 02:42:12 +00:00
Alan Viverette
f878c298e1 Apply theme to PreferenceActivity headers 
BUG: 11900302
Change-Id: Ibd1b08b412f6e64b44b2f3f07d297ede8fa01367
 2013-12-02 18:36:00 -08:00
Glenn Kasten
132dae417d Merge "Document need to call AudioRecord.getState() after construction" 2013-12-03 01:09:21 +00:00
Glenn Kasten
4a1232f814 Merge "Include more information in AudioRecord error logs" 2013-12-03 00:31:13 +00:00
Dirk Dougherty
1c64e2f429 Add samples TOC generated from browsable sources. 
Change-Id: I760eceb3a315d5fd1b65ecdcd014a9507990a26b
 2013-12-03 00:14:39 +00:00
Mathieu Chartier
36c245ace5 am dae9f5a5: am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 
* commit 'dae9f5a5158257c65fae014b38bde08741b97e62':
  Add dalvik.vm.gctype to enable switching between different GCs.
 2013-12-03 00:10:13 +00:00
Mathieu Chartier
dae9f5a515 am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 
* commit 'f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79':
  Add dalvik.vm.gctype to enable switching between different GCs.
 2013-12-03 00:05:32 +00:00
Mathieu Chartier
f3a2430a2b am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 
* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
  Add dalvik.vm.gctype to enable switching between different GCs.
 2013-12-02 16:00:49 -08:00
Mathieu Chartier
738fa2f64e Merge "Add dalvik.vm.gctype to enable switching between different GCs." 2013-12-02 23:53:10 +00:00
Mathieu Chartier
7e4fdec6f0 Add dalvik.vm.gctype to enable switching between different GCs. 
The option passes the specified GC type into the Xgc runtime
option.

Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.

Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
 2013-12-02 15:50:18 -08:00
Scott Main
3c9a736266 am 5c4c68da: am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit '5c4c68da547d0031a2c43a6e0a35f6c8b9e1f5c0':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 23:32:08 +00:00
Dirk Dougherty
dfccc3be41 am ac5894d4: am ba6854d6: am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs 
* commit 'ac5894d4b2946c21c4593a09a36d071280d3cd8b':
  Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
 2013-12-02 23:32:03 +00:00
Scott Main
8ffdccdac3 am 8be9d428: am b7cdfa02: am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat 
* commit '8be9d428a160e0bc4457d1ecf729a85beeeaf186':
  dashboard update for 12/2/13 first appearance of kitkat
 2013-12-02 23:31:54 +00:00
Nick Kralevich
0e5aeca7ba am 18c2736c: am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit '18c2736cf0afc41e8ee602b7016e668ac267151e':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 23:31:50 +00:00
Geoff Mendal
97104b170f am 6415d688: (-s ours) am 09ecd7e2: (-s ours) am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE 
* commit '6415d688e049e009e2c4e4dce488ab7f145304b3':
  Import translations. DO NOT MERGE
 2013-12-02 23:31:35 +00:00
Geoff Mendal
2973d25edf am 7f150f86: (-s ours) am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE 
* commit '7f150f8676f2564df274380320bc5ea3c2e138de':
  Import translations. DO NOT MERGE
 2013-12-02 23:08:02 +00:00
Xavier Ducrohet
9f38adc4da am 1d3205f6: (-s ours) am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev 
* commit '1d3205f62a75b92cda1b10f3151234741e4e708b':
  Update delegate methods in layoutlib.
 2013-12-02 23:07:59 +00:00
Jason Sams
5a2ed23cbf Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-12-02 23:07:58 +00:00
John Spurlock
74d2480845 Move moveable non-public framework resources up to SystemUI 
Specifically, non-public resources only referenced by SystemUI
and nowhere else in frameworks or system apps (via @*android:)

Remove orphan resources found during the process.

Change-Id: I005514ff1ce52e1622849bc01cd825b09fa55842
 2013-12-02 17:37:40 -05:00
Scott Main
5c4c68da54 am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit 'd400e6146b18b12a75d750654b8a118105fd1834':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 22:29:33 +00:00
Scott Main
d400e6146b am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit '7511d659a2a3815cc6894cd71ebed0a27e341430':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 14:25:52 -08:00
Scott Main
7511d659a2 am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 
* commit '2dd715ed45b9000eab81b0972d0585294d7f9ddd':
  fix FPS typo in JB highlights, reported by vharron
 2013-12-02 22:20:22 +00:00
Leon Scroggins III
82b7b0b2af Remove call to deprecated function. 
setPrefConfigTable(array) is being removed in
https://codereview.chromium.org/99473004

Change-Id: I2d7e25052861f7f1d54e2418c11204d51bb88b1e
 2013-12-02 17:17:21 -05:00
Scott Main
2dd715ed45 Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs 2013-12-02 22:16:24 +00:00
Dirk Dougherty
ac5894d4b2 am ba6854d6: am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs 
* commit 'ba6854d6f6e564d3cfad70ad0674924a1aca6cc9':
  Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
 2013-12-02 21:57:50 +00:00
Dirk Dougherty
ba6854d6f6 am b5d5a787: am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs 
* commit 'b5d5a787e31bcba8822545c56d6506a38229bf22':
  Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
 2013-12-02 13:53:52 -08:00
Dirk Dougherty
b5d5a787e3 am 19d3ac5e: Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs 
* commit '19d3ac5eb67bcb99f249642d41bcea89d7146104':
  Doc change: update gcore docs to fix javadoc ref error and expose Samples tab.
 2013-12-02 21:49:31 +00:00
Dirk Dougherty
19d3ac5eb6 Merge "Doc change: update gcore docs to fix javadoc ref error and expose Samples tab." into klp-docs 2013-12-02 21:47:04 +00:00
Dirk Dougherty
d189845323 Doc change: update gcore docs to fix javadoc ref error and expose Samples tab. 
Change-Id: I93133f3424127a0e2da256eceee3eebc8c8add18
 2013-12-02 13:40:27 -08:00
Alan Viverette
8af04d8b85 Merge "Fix LongArray.addAll() to use correct arraycopy argument order" 2013-12-02 21:20:07 +00:00
Scott Main
351001f904 fix FPS typo in JB highlights, reported by vharron 
Change-Id: I6a98af7730d1e56f08b5ba9a9f7d462cc35e17e8
 2013-12-02 12:55:33 -08:00
Lorenzo Colitti
317d15c155 am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications." 
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
  Use LinkAddress in address notifications.
 2013-12-02 20:53:06 +00:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master 
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
 2013-12-02 12:37:58 -08:00
Scott Main
8be9d428a1 am b7cdfa02: am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat 
* commit 'b7cdfa0238436d2ead785587bd50ec560bcae5bb':
  dashboard update for 12/2/13 first appearance of kitkat
 2013-12-02 20:28:56 +00:00
Scott Main
b7cdfa0238 am b243bbb4: am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat 
* commit 'b243bbb4c89e67bdbf11df47dd79645c398b877b':
  dashboard update for 12/2/13 first appearance of kitkat
 2013-12-02 12:25:07 -08:00
Scott Main
b243bbb4c8 am 65907fd4: dashboard update for 12/2/13 first appearance of kitkat 
* commit '65907fd4af6a1074a7b052751746fd99095627c6':
  dashboard update for 12/2/13 first appearance of kitkat
 2013-12-02 20:21:33 +00:00
Nick Kralevich
18c2736cf0 am a5a0de9f: am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit 'a5a0de9f2943c6188bd5855adfe4c5da7a985d2d':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 20:12:55 +00:00
Scott Main
65907fd4af dashboard update for 12/2/13 
first appearance of kitkat

Change-Id: I528cb8d938b3a9e0da4c44db2b615ad90c211436
 2013-12-02 12:11:22 -08:00
Nick Kralevich
a5a0de9f29 am b6634304: Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 
* commit 'b66343049bc56d29988a91d2d29d49861a469b84':
  Remove setEnforcingMode from SELinuxPolicyInstallReceiver.
 2013-12-02 12:08:42 -08:00
Nick Kralevich
b66343049b Merge "Remove setEnforcingMode from SELinuxPolicyInstallReceiver." 2013-12-02 20:00:28 +00:00