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

107812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
5414f83d38 am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:28:32 +00:00
Deepanshu Gupta
d2829b4909 am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit '432d16f97adab9d845904e25b50671cf35cfb628':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:24:17 +00:00
Deepanshu Gupta
5acf782c68 am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'd751eed44bcb28461dc853df08b89e5bc8ab6f60':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:19:46 +00:00
Deepanshu Gupta
d751eed44b am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'b49e21e153c59b31503a376d62257e4fc6e7ce4f':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:15:39 +00:00
Deepanshu Gupta
432d16f97a Change font family name. [DO NOT MERGE] 
During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)
 2014-07-08 23:14:36 +00:00
Deepanshu Gupta
b49e21e153 Add a script to rename fonts for SDK. [DO NOT MERGE] 
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.

Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
(cherry picked from commit c57b410c8ef41e269f82f3b42a8d22a15c08755b)
 2014-06-12 16:13:18 -07:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
 2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
 2014-06-10 02:32:29 +00:00
Deepanshu Gupta
dcfba78fbb am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:38:25 +00:00
Deepanshu Gupta
ed5ab0f01e am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:34:14 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:30:05 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:27:49 +00:00
Deepanshu Gupta
c8235b8e74 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
ffcad247d0 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:17:40 +00:00
Deepanshu Gupta
328b1f9278 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:37 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +00:00
Deepanshu Gupta
dade24b491 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 2014-06-04 20:07:44 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Deepanshu Gupta
b1ca2a0c7f am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:34:15 +00:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
f52fcc7054 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 2014-06-04 19:31:31 +00:00
Deepanshu Gupta
2a57694d0a am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:02:55 +00:00
Deepanshu Gupta
e2edd753e8 am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '76364c6970f86bdf67622c14c9f1ebac6883998b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:58:41 +00:00
Deepanshu Gupta
76364c6970 am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:53:49 +00:00
Deepanshu Gupta
d0f215756a am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:37 +00:00
Deepanshu Gupta
c8414f11d7 am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:43:53 +00:00
Deepanshu Gupta
9bfbe93a7e am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:43:50 +00:00
Deepanshu Gupta
3c1d72c2ef am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'ab869de19efc24265eebda19a97628713e072178':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:41:34 +00:00
Deepanshu Gupta
4dcb4a1f03 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '236b71649ce008578cf77557033df322e93a1e17':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:39:10 +00:00
Deepanshu Gupta
dd46bfd095 am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:39:08 +00:00
Deepanshu Gupta
ab869de19e am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:36:41 +00:00
Deepanshu Gupta
236b71649c am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:35:12 +00:00
Deepanshu Gupta
02d88f7b35 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:35:09 +00:00
Deepanshu Gupta
cd192c0b1c am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:55 +00:00
Deepanshu Gupta
0ab0d875d4 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:53 +00:00
Deepanshu Gupta
ffbf24476c am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:30:50 +00:00
Deepanshu Gupta
704954c96a am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:28:48 +00:00
Deepanshu Gupta
661e158b0a am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:27:08 +00:00
Deepanshu Gupta
28f550f010 am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:25:51 +00:00
Deepanshu Gupta
083af20d9d am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:25:48 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
2ac96a093b am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:20 +00:00
Deepanshu Gupta
03a832669d am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '08d2007b33838570a96c8df890f0757fa920904c':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:12 +00:00